DYN-8095: Handle crash by using FirstOrDefault() instead of First() (#15958)

zeusongit · web-flow · commit a2600de809f6 · 2025-03-21T16:43:00.000-04:00
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -2157,14 +2157,13 @@ internal void RemoveSingleItem(PackageItemRootViewModel vm, DependencyType fileT
             if (fileType.Equals(DependencyType.Assembly))
             {
                 Assemblies.Remove(Assemblies
-                    .First(x => x.Name == fileName));
+                    .FirstOrDefault(x => x.Name == fileName));
             }
             else if (fileName.ToLower().EndsWith(".dll"))
             {
                 fileName = vm.FilePath;
                 AdditionalFiles.Remove(AdditionalFiles
-                    .First(x => x == fileName));
-
+                    .FirstOrDefault(x => x == fileName));
             }
             else if (fileType.Equals(DependencyType.CustomNode) || fileType.Equals(DependencyType.CustomNodePreview))
             {
@@ -2198,7 +2197,7 @@ internal void RemoveSingleItem(PackageItemRootViewModel vm, DependencyType fileT
             {
                 fileName = vm.FilePath;
                 AdditionalFiles.Remove(AdditionalFiles
-                    .First(x => x == fileName));
+                    .FirstOrDefault(x => x == fileName));
             }
         }
 
diff --git a/test/DynamoCoreWpf3Tests/PublishPackageViewModelTests.cs b/test/DynamoCoreWpf3Tests/PublishPackageViewModelTests.cs
@@ -98,6 +98,7 @@ public void CanRemoveCustomNodesWithIdenticalNames()
             var item1 = new PackageItemRootViewModel("Geometry.Curve.dyf", "C:\\test\\Geometry.Curve.dyf");
             var item2 = new PackageItemRootViewModel("Building.Curve.dyf", "C:\\test\\Building.Curve.dyf");
             var item3 = new PackageItemRootViewModel("Curve.dyf", "C:\\test\\Curve.dyf");
+            var item4 = new PackageItemRootViewModel("Curve.dll", "C:\\dummy\\Curve.dll");
 
             // Assert
             vm.RemoveSingleItem(item1, DependencyType.CustomNodePreview);
@@ -108,6 +109,9 @@ public void CanRemoveCustomNodesWithIdenticalNames()
 
             vm.RemoveSingleItem(item3, DependencyType.CustomNodePreview);
             Assert.AreEqual(0, vm.CustomNodeDefinitions.Count);
+
+            //assert that the method does not throw exception when the item is not found
+            Assert.DoesNotThrow(() => { vm.RemoveSingleItem(item4, DependencyType.Assembly); });
         }
 
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -2157,14 +2157,13 @@ internal void RemoveSingleItem(PackageItemRootViewModel vm, DependencyType fileT`
`2157`	`2157`	`if (fileType.Equals(DependencyType.Assembly))`
`2158`	`2158`	`{`
`2159`	`2159`	`Assemblies.Remove(Assemblies`
`2160`		`- .First(x => x.Name == fileName));`
	`2160`	`+ .FirstOrDefault(x => x.Name == fileName));`
`2161`	`2161`	`}`
`2162`	`2162`	`else if (fileName.ToLower().EndsWith(".dll"))`
`2163`	`2163`	`{`
`2164`	`2164`	`fileName = vm.FilePath;`
`2165`	`2165`	`AdditionalFiles.Remove(AdditionalFiles`
`2166`		`- .First(x => x == fileName));`
`2167`		`-`
	`2166`	`+ .FirstOrDefault(x => x == fileName));`
`2168`	`2167`	`}`
`2169`	`2168`	`else if (fileType.Equals(DependencyType.CustomNode) \|\| fileType.Equals(DependencyType.CustomNodePreview))`
`2170`	`2169`	`{`
`@@ -2198,7 +2197,7 @@ internal void RemoveSingleItem(PackageItemRootViewModel vm, DependencyType fileT`
`2198`	`2197`	`{`
`2199`	`2198`	`fileName = vm.FilePath;`
`2200`	`2199`	`AdditionalFiles.Remove(AdditionalFiles`
`2201`		`- .First(x => x == fileName));`
	`2200`	`+ .FirstOrDefault(x => x == fileName));`
`2202`	`2201`	`}`
`2203`	`2202`	`}`
`2204`	`2203`