rebase

Author: tomerd

Sources/PackageGraph/Pubgrub/PubgrubDependencyResolver.swift

@@ -270,7 +270,7 @@ public struct PubgrubDependencyResolver {
         // The list of version-based references reachable via local and branch-based references.
         // These are added as top-level incompatibilities since they always need to be satisfied.
         // Some of these might be overridden as we discover local and branch-based references.
-        var versionBasedDependencies = OrderedDictionary<DependencyResolutionNode, [VersionBasedConstraint]>()
+        var versionBasedDependencies = OrderedCollections.OrderedDictionary<DependencyResolutionNode, [VersionBasedConstraint]>()
 
         // Process unversioned constraints in first phase. We go through all of the unversioned packages
         // and collect them and their dependencies. This gives us the complete list of unversioned

Tests/PackageGraphTests/PubgrubTests.swift

@@ -2803,15 +2803,15 @@ class DependencyGraphBuilder {
     func create(
         dependencies: OrderedCollections.OrderedDictionary<String, (PackageRequirement, ProductFilter)>
     ) -> [PackageContainerConstraint] {
-        var refDependencies = OrderedDictionary<PackageReference, (PackageRequirement, ProductFilter)>()
+        var refDependencies = OrderedCollections.OrderedDictionary<PackageReference, (PackageRequirement, ProductFilter)>()
         for dependency in dependencies {
             refDependencies[reference(for: dependency.key)] = dependency.value
         }
         return self.create(dependencies: refDependencies)
     }
 
     func create(
-        dependencies: OrderedDictionary<PackageReference, (PackageRequirement, ProductFilter)>
+        dependencies: OrderedCollections.OrderedDictionary<PackageReference, (PackageRequirement, ProductFilter)>
     ) -> [PackageContainerConstraint] {
         return dependencies.map {
             PackageContainerConstraint(package: $0, requirement: $1.0, products: $1.1)
@@ -2846,7 +2846,7 @@ class DependencyGraphBuilder {
         _ packageReference: PackageReference,
         at version: BoundVersion,
         toolsVersion: ToolsVersion? = nil,
-        with dependencies: KeyValuePairs<String, OrderedDictionary<String, (PackageRequirement, ProductFilter)>> = [:]
+        with dependencies: KeyValuePairs<String, OrderedCollections.OrderedDictionary<String, (PackageRequirement, ProductFilter)>> = [:]
     ) {
         let container = self.containers[packageReference.identity.description] ?? MockContainer(package: packageReference)