Merge pull request #73 from CycloneDX/issue72

coderpatros · web-flow · commit 82e623868112 · 2021-02-14T21:45:51.000+10:00
Fix handling of situations where more component versions have been removed than added
diff --git a/cyclonedx/Commands/Convert/DiffCommand.cs b/cyclonedx/Commands/Convert/DiffCommand.cs
@@ -106,7 +106,7 @@ public static async Task<int> Diff(
 
                 foreach (var fromComponent in new List<Component>(fromComponents))
                 {
-                    var toComponent = toComponents.First(c => c.Name == fromComponent.Name);
+                    var toComponent = toComponents.FirstOrDefault(c => c.Name == fromComponent.Name);
                     if (toComponent != null)
                     {
                         result.ComponentVersions.Modified.Add(new ModifiedDiffItem<Component>

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public static async Task<int> Diff(`
`106`	`106`
`107`	`107`	`foreach (var fromComponent in new List<Component>(fromComponents))`
`108`	`108`	`{`
`109`		`- var toComponent = toComponents.First(c => c.Name == fromComponent.Name);`
	`109`	`+ var toComponent = toComponents.FirstOrDefault(c => c.Name == fromComponent.Name);`
`110`	`110`	`if (toComponent != null)`
`111`	`111`	`{`
`112`	`112`	`result.ComponentVersions.Modified.Add(new ModifiedDiffItem<Component>`