20var item1 = new MockConflictItem("System.Ben"); 21var item2 = new MockConflictItem("System.Immo"); 32var item1 = new MockConflictItem() { Exists = false }; 33var item2 = new MockConflictItem() { Exists = true }; 44var item1 = new MockConflictItem() { Exists = false, AssemblyVersion = new Version("1.0.0.0") }; 45var item2 = new MockConflictItem() { Exists = false, AssemblyVersion = new Version("2.0.0.0") }; 58new MockConflictItem("System.Ben"), 59new MockConflictItem("System.Immo") { Exists = false }, 60new MockConflictItem("System.Dave") 70var item1 = new MockConflictItem() { AssemblyVersion = null, FileVersion = new Version("1.0.0.0") }; 71var item2 = new MockConflictItem() { AssemblyVersion = null, FileVersion = new Version("3.0.0.0") }; 72var item3 = new MockConflictItem() { AssemblyVersion = null, FileVersion = new Version("2.0.0.0") }; 83var item1 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 84var item2 = new MockConflictItem() { AssemblyVersion = null }; 95var item1 = new MockConflictItem() { FileVersion = new Version("3.0.0.0") }; 96var item2 = new MockConflictItem() { FileVersion = new Version("2.0.0.0") }; 97var item3 = new MockConflictItem() { FileVersion = new Version("1.0.0.0") }; 108var item1 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 109var item2 = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 110var item3 = new MockConflictItem() { AssemblyVersion = new Version("3.0.0.0") }; 121var item1 = new MockConflictItem() { FileVersion = null, PackageId = "Package3" }; 122var item2 = new MockConflictItem() { FileVersion = null, PackageId = "Package2" }; 123var item3 = new MockConflictItem() { FileVersion = null, PackageId = "Package1" }; 134var item1 = new MockConflictItem() { FileVersion = null }; 135var item2 = new MockConflictItem() { FileVersion = new Version("1.0.0.0") }; 146var item1 = new MockConflictItem() { PackageId = "Package2" }; 147var item2 = new MockConflictItem() { PackageId = "Package3" }; 148var item3 = new MockConflictItem() { PackageId = "Package1" }; 159var item1 = new MockConflictItem() { FileVersion = new Version("2.0.0.0") }; 160var item2 = new MockConflictItem() { FileVersion = new Version("1.0.0.0") }; 161var item3 = new MockConflictItem() { FileVersion = new Version("3.0.0.0") }; 172var item1 = new MockConflictItem() { PackageId = "Unranked1", ItemType = ConflictItemType.Platform }; 173var item2 = new MockConflictItem() { PackageId = "Unranked2", ItemType = ConflictItemType.Reference }; 184var item1 = new MockConflictItem() { PackageId = "Unranked1" }; 185var item2 = new MockConflictItem() { PackageId = "Ranked1" }; 196var item1 = new MockConflictItem() { PackageId = "Package1", ItemType = ConflictItemType.Reference }; 197var item2 = new MockConflictItem() { PackageId = "Package1", ItemType = ConflictItemType.Platform }; 209var item1 = new MockConflictItem() { PackageId = "Package1" }; 210var item2 = new MockConflictItem() { PackageId = "Package2" }; 211var item3 = new MockConflictItem() { PackageId = "Package3" }; 228var items = versions.Select(v => new MockConflictItem() { FileVersion = new Version(v, 0, 0, 0) }) 247var items = versions.Select(v => new MockConflictItem() { FileVersion = new Version(v, 0, 0, 0) }) 259var item1 = new MockConflictItem() { ItemType = ConflictItemType.Platform }; 260var item2 = new MockConflictItem() { ItemType = ConflictItemType.Platform }; 271var item1 = new MockConflictItem() { ItemType = ConflictItemType.Reference }; 272var item2 = new MockConflictItem() { ItemType = ConflictItemType.CopyLocal }; 283var item1 = new MockConflictItem() { ItemType = ConflictItemType.Reference }; 284var item2 = new MockConflictItem() { ItemType = ConflictItemType.Platform }; 295var committedItem = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 297var uncommittedItem1 = new MockConflictItem() { AssemblyVersion = new Version("3.0.0.0") }; 298var uncommittedItem2 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 299var uncommittedItem3 = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 310var committedItem = new MockConflictItem(); 312var uncommittedItem1 = new MockConflictItem(); 313var uncommittedItem2 = new MockConflictItem(); 314var uncommittedItem3 = new MockConflictItem(); 325var committedItem = new MockConflictItem() { AssemblyVersion = new Version("4.0.0.0") }; 327var uncommittedItem1 = new MockConflictItem() { AssemblyVersion = new Version("3.0.0.0") }; 328var uncommittedItem2 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 329var uncommittedItem3 = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 340var committedItem1 = new MockConflictItem("System.Ben") { AssemblyVersion = new Version("2.0.0.0") }; 341var committedItem2 = new MockConflictItem("System.Immo") { AssemblyVersion = new Version("2.0.0.0") }; 343var uncommittedItem1 = new MockConflictItem("System.Ben") { AssemblyVersion = new Version("1.0.0.0") }; 344var uncommittedItem2 = new MockConflictItem("System.Immo") { AssemblyVersion = new Version("3.0.0.0") }; 345var uncommittedItem3 = new MockConflictItem("System.Dave") { AssemblyVersion = new Version("3.0.0.0") }; 346var uncommittedItem4 = new MockConflictItem("System.Ben") { AssemblyVersion = new Version("3.0.0.0") }; 357var systemItem1 = new MockConflictItem("System.Ben") { PackageId = "System.Ben", PackageVersion = new NuGetVersion("4.3.0") }; 358var systemItem2 = new MockConflictItem("System.Immo") { PackageId = "System.Immo", PackageVersion = new NuGetVersion("4.2.0") }; 359var systemItem3 = new MockConflictItem("System.Dave") { PackageId = "System.Dave", PackageVersion = new NuGetVersion("4.1.0") }; 361var platformItem1 = new MockConflictItem("System.Ben") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 362var platformItem2 = new MockConflictItem("System.Immo") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 363var platformItem3 = new MockConflictItem("System.Dave") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 382var platformItem1 = new MockConflictItem("System.Ben") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 383var platformItem2 = new MockConflictItem("System.Immo") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 384var platformItem3 = new MockConflictItem("System.Dave") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 386var systemItem1 = new MockConflictItem("System.Ben") { PackageId = "System.Ben", PackageVersion = new NuGetVersion("4.3.0") }; 387var systemItem2 = new MockConflictItem("System.Immo") { PackageId = "System.Immo", PackageVersion = new NuGetVersion("4.2.0") }; 389var systemItem3 = new MockConflictItem("System.Dave")

50Assert.Null(resolver.Resolve(new MockConflictItem(), new MockConflictItem())); 68var packageItem = new MockConflictItem("System.Eric") 76var platformItem = new MockConflictItem("System.Eric") 86var packageItem2 = new MockConflictItem("System.Eric")

20var item1 = new MockConflictItem("System.Ben"); 21var item2 = new MockConflictItem("System.Immo"); 32var item1 = new MockConflictItem() { Exists = false }; 33var item2 = new MockConflictItem() { Exists = true }; 44var item1 = new MockConflictItem() { Exists = false, AssemblyVersion = new Version("1.0.0.0") }; 45var item2 = new MockConflictItem() { Exists = false, AssemblyVersion = new Version("2.0.0.0") }; 70var item1 = new MockConflictItem() { AssemblyVersion = null, FileVersion = new Version("1.0.0.0") }; 71var item2 = new MockConflictItem() { AssemblyVersion = null, FileVersion = new Version("3.0.0.0") }; 72var item3 = new MockConflictItem() { AssemblyVersion = null, FileVersion = new Version("2.0.0.0") }; 83var item1 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 84var item2 = new MockConflictItem() { AssemblyVersion = null }; 95var item1 = new MockConflictItem() { FileVersion = new Version("3.0.0.0") }; 96var item2 = new MockConflictItem() { FileVersion = new Version("2.0.0.0") }; 97var item3 = new MockConflictItem() { FileVersion = new Version("1.0.0.0") }; 108var item1 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 109var item2 = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 110var item3 = new MockConflictItem() { AssemblyVersion = new Version("3.0.0.0") }; 121var item1 = new MockConflictItem() { FileVersion = null, PackageId = "Package3" }; 122var item2 = new MockConflictItem() { FileVersion = null, PackageId = "Package2" }; 123var item3 = new MockConflictItem() { FileVersion = null, PackageId = "Package1" }; 134var item1 = new MockConflictItem() { FileVersion = null }; 135var item2 = new MockConflictItem() { FileVersion = new Version("1.0.0.0") }; 146var item1 = new MockConflictItem() { PackageId = "Package2" }; 147var item2 = new MockConflictItem() { PackageId = "Package3" }; 148var item3 = new MockConflictItem() { PackageId = "Package1" }; 159var item1 = new MockConflictItem() { FileVersion = new Version("2.0.0.0") }; 160var item2 = new MockConflictItem() { FileVersion = new Version("1.0.0.0") }; 161var item3 = new MockConflictItem() { FileVersion = new Version("3.0.0.0") }; 172var item1 = new MockConflictItem() { PackageId = "Unranked1", ItemType = ConflictItemType.Platform }; 173var item2 = new MockConflictItem() { PackageId = "Unranked2", ItemType = ConflictItemType.Reference }; 184var item1 = new MockConflictItem() { PackageId = "Unranked1" }; 185var item2 = new MockConflictItem() { PackageId = "Ranked1" }; 196var item1 = new MockConflictItem() { PackageId = "Package1", ItemType = ConflictItemType.Reference }; 197var item2 = new MockConflictItem() { PackageId = "Package1", ItemType = ConflictItemType.Platform }; 209var item1 = new MockConflictItem() { PackageId = "Package1" }; 210var item2 = new MockConflictItem() { PackageId = "Package2" }; 211var item3 = new MockConflictItem() { PackageId = "Package3" }; 259var item1 = new MockConflictItem() { ItemType = ConflictItemType.Platform }; 260var item2 = new MockConflictItem() { ItemType = ConflictItemType.Platform }; 271var item1 = new MockConflictItem() { ItemType = ConflictItemType.Reference }; 272var item2 = new MockConflictItem() { ItemType = ConflictItemType.CopyLocal }; 283var item1 = new MockConflictItem() { ItemType = ConflictItemType.Reference }; 284var item2 = new MockConflictItem() { ItemType = ConflictItemType.Platform }; 295var committedItem = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 297var uncommittedItem1 = new MockConflictItem() { AssemblyVersion = new Version("3.0.0.0") }; 298var uncommittedItem2 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 299var uncommittedItem3 = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 310var committedItem = new MockConflictItem(); 312var uncommittedItem1 = new MockConflictItem(); 313var uncommittedItem2 = new MockConflictItem(); 314var uncommittedItem3 = new MockConflictItem(); 325var committedItem = new MockConflictItem() { AssemblyVersion = new Version("4.0.0.0") }; 327var uncommittedItem1 = new MockConflictItem() { AssemblyVersion = new Version("3.0.0.0") }; 328var uncommittedItem2 = new MockConflictItem() { AssemblyVersion = new Version("1.0.0.0") }; 329var uncommittedItem3 = new MockConflictItem() { AssemblyVersion = new Version("2.0.0.0") }; 340var committedItem1 = new MockConflictItem("System.Ben") { AssemblyVersion = new Version("2.0.0.0") }; 341var committedItem2 = new MockConflictItem("System.Immo") { AssemblyVersion = new Version("2.0.0.0") }; 343var uncommittedItem1 = new MockConflictItem("System.Ben") { AssemblyVersion = new Version("1.0.0.0") }; 344var uncommittedItem2 = new MockConflictItem("System.Immo") { AssemblyVersion = new Version("3.0.0.0") }; 345var uncommittedItem3 = new MockConflictItem("System.Dave") { AssemblyVersion = new Version("3.0.0.0") }; 346var uncommittedItem4 = new MockConflictItem("System.Ben") { AssemblyVersion = new Version("3.0.0.0") }; 357var systemItem1 = new MockConflictItem("System.Ben") { PackageId = "System.Ben", PackageVersion = new NuGetVersion("4.3.0") }; 358var systemItem2 = new MockConflictItem("System.Immo") { PackageId = "System.Immo", PackageVersion = new NuGetVersion("4.2.0") }; 359var systemItem3 = new MockConflictItem("System.Dave") { PackageId = "System.Dave", PackageVersion = new NuGetVersion("4.1.0") }; 361var platformItem1 = new MockConflictItem("System.Ben") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 362var platformItem2 = new MockConflictItem("System.Immo") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 363var platformItem3 = new MockConflictItem("System.Dave") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 367Array.Empty<MockConflictItem>(), 382var platformItem1 = new MockConflictItem("System.Ben") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 383var platformItem2 = new MockConflictItem("System.Immo") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 384var platformItem3 = new MockConflictItem("System.Dave") { PackageId = "Platform", PackageVersion = new NuGetVersion("2.0.0") }; 386var systemItem1 = new MockConflictItem("System.Ben") { PackageId = "System.Ben", PackageVersion = new NuGetVersion("4.3.0") }; 387var systemItem2 = new MockConflictItem("System.Immo") { PackageId = "System.Immo", PackageVersion = new NuGetVersion("4.2.0") }; 389var systemItem3 = new MockConflictItem("System.Dave") 398Array.Empty<MockConflictItem>(), 410static ConflictResults GetConflicts(params MockConflictItem[] items) 412return GetConflicts(items, Array.Empty<MockConflictItem>()); 415static ConflictResults GetConflicts(MockConflictItem[] itemsToCommit, params MockConflictItem[] itemsNotToCommit) 420static ConflictResults GetConflicts(MockConflictItem[] itemsToCommit, MockConflictItem[] itemsNotToCommit, ITaskItem[] packageOverrides) 424void ConflictHandler(MockConflictItem winner, MockConflictItem loser) 429void UnresolvedConflictHandler(MockConflictItem item) 441var overrideResolver = new PackageOverrideResolver<MockConflictItem>(packageOverrides); 443using (var resolver = new ConflictResolver<MockConflictItem>(new PackageRank(packagesForRank), overrideResolver, new MockLog())) 456static string GetItemKey(MockConflictItem item) 463public List<MockConflictItem> Conflicts { get; set; } = new List<MockConflictItem>(); 464public List<MockConflictItem> UnresolvedConflicts { get; set; } = new List<MockConflictItem>();

31var resolver = new PackageOverrideResolver<MockConflictItem>(packageOverrides); 47var resolver = new PackageOverrideResolver<MockConflictItem>(null); 64var resolver = new PackageOverrideResolver<MockConflictItem>(packageOverrides); 68var packageItem = new MockConflictItem("System.Eric") 76var platformItem = new MockConflictItem("System.Eric") 86var packageItem2 = new MockConflictItem("System.Eric")