Skip to content

[6.2] - Resolve traits on top level manifests #9307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2025
Merged

[6.2] - Resolve traits on top level manifests #9307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Sources/Workspace/Workspace+Manifests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,15 @@ extension Workspace {
// optimization: preload first level dependencies manifest (in parallel)
let firstLevelDependencies = try topLevelManifests.values.map { manifest in
let parentEnabledTraits = self.enabledTraitsMap[manifest.packageIdentity]

// Resolve and flatten the list of traits on top level manifests. This handles
// the case where a package is being loaded in a wrapper project (not package),
// where there are no root packages but there are dependencies.
if root.packages.isEmpty {
let topLevelManifestTraits = try manifest.enabledTraits(using: parentEnabledTraits, nil)
self.enabledTraitsMap[manifest.packageIdentity] = topLevelManifestTraits
}

return try manifest.dependencies.filter { dep in
let explicitlyEnabledTraits = dep.traits?.filter({
guard let condition = $0.condition else { return true }
Expand Down