Revert "Refactor Commands module (#5807)"

This reverts commit 2a5650d.

Author: CodaFi

Package.swift

@@ -342,28 +342,13 @@ let package = Package(
 
         // MARK: Commands
 
-        .target(
-            /** Minimal set of commands required for bootstrapping a new SwiftPM */
-            name: "CoreCommands",
-            dependencies: [
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                "Basics",
-                "Build",
-                "PackageFingerprint",
-                "PackageModel",
-                "Workspace",
-            ],
-            exclude: ["CMakeLists.txt"]
-        ),
-
         .target(
             /** High-level commands */
             name: "Commands",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 "Basics",
                 "Build",
-                "CoreCommands",
                 "PackageCollections",
                 "PackageFingerprint",
                 "PackageGraph",

Sources/CMakeLists.txt

@@ -10,7 +10,6 @@ add_subdirectory(SPMSQLite3)
 add_subdirectory(Basics)
 add_subdirectory(Build)
 add_subdirectory(Commands)
-add_subdirectory(CoreCommands)
 add_subdirectory(DriverSupport)
 add_subdirectory(LLBuildManifest)
 add_subdirectory(PackageCollections)

Sources/Commands/CMakeLists.txt

@@ -7,6 +7,7 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_library(Commands
+  Options.swift
   Snippets/CardEvent.swift
   Snippets/Cards/SnippetCard.swift
   Snippets/Cards/SnippetGroupCard.swift
@@ -20,7 +21,7 @@ add_library(Commands
   SwiftPackageTool.swift
   SwiftRunTool.swift
   SwiftTestTool.swift
-  ToolWorkspaceDelegate.swift
+  SwiftTool.swift
   Utilities/APIDigester.swift
   Utilities/DependenciesSerializer.swift
   Utilities/Describe.swift
@@ -33,7 +34,6 @@ target_link_libraries(Commands PUBLIC
   ArgumentParser
   Basics
   Build
-  CoreCommands
   PackageCollections
   PackageFingerprint
   PackageGraph