fixup

Author: tomerd

Sources/Commands/show-dependencies.swift

@@ -88,7 +88,6 @@ private final class DotDumper: DependenciesDumper {
             let url = package.manifest.packageLocation
             if nodesAlreadyPrinted.contains(url) { return }
             let pkgVersion = package.manifest.version?.description ?? "unspecified"
-            // 👀 is this correct? or manifest name is better?
             stream <<< #""\#(url)" [label="\#(package.identity.description)\n\#(url)\n\#(pkgVersion)"]"# <<< "\n"
             nodesAlreadyPrinted.insert(url)
         }

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -38,7 +38,7 @@ extension PackageGraph {
         let rootManifestsMap = root.packages.mapValues { $0.manifest }
         let externalManifestsMap = externalManifests.map{ (identityResolver.resolveIdentity(for: $0.packageLocation), $0) }
         let manifestMap = rootManifestsMap.merging(externalManifestsMap, uniquingKeysWith: { lhs, rhs in
-            return rhs // 👀 this was not possible before (the dictionary creation would crash), is preferring external correct?
+            return lhs
         })
 
         let successors: (GraphLoadingNode) -> [GraphLoadingNode] = { node in

Sources/SPMBuildCore/PluginInvocation.swift

@@ -61,7 +61,7 @@ extension PackageGraph {
             var evalResults: [PluginInvocationResult] = []
             for pluginTarget in pluginTargets {
                 // Give each invocation of a plugin a separate output directory.
-                let pluginOutputDir = outputDir.appending(components: package.manifestName, target.name, pluginTarget.name)
+                let pluginOutputDir = outputDir.appending(components: package.identity.description, target.name, pluginTarget.name)
                 do {
                     try fileSystem.createDirectory(pluginOutputDir, recursive: true)
                 }