Merge pull request #15 from fabiocesarato/master

Fix null reference on BIN file load
microsoft · Dec 15, 2015 · d015eac · d015eac
2 parents 173571d + 18875e4
commit d015eac
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/VS.ConfigurationManager/Primitives.cs b/src/VS.ConfigurationManager/Primitives.cs
@@ -865,11 +865,11 @@ private void GetContent(ref ICollection<Bundle> rels, string path)
                         // Does a PDB exist for the file that we are reading?
                         var filenamewithoutextension = Path.GetFileNameWithoutExtension(fileitem);
 
-                        if (releases.Where(x => x.Name == filenamewithoutextension) != null)
+                        if (releases.Where(x => x.Name == filenamewithoutextension).Count() != 0)
                         {
                             // Update values to use the file instead
-                            releases.FirstOrDefault(x => x.Name == filenamewithoutextension).FileType = FILETYPE_BIN;
-                            releases.FirstOrDefault(x => x.Name == filenamewithoutextension).binPath = Path.Combine(path, fileitem);
+                            releases.First(x => x.Name == filenamewithoutextension).FileType = FILETYPE_BIN;
+                            releases.First(x => x.Name == filenamewithoutextension).binPath = Path.Combine(path, fileitem);
                         }
                         else // If there is no wixpdb does not exist, pull data from the file to populate releases
                         {