fixing an instance error in NugetDevDependencyParser and the check fo…

…r null in test case
siemens · Nov 9, 2023 · fd4b61e · fd4b61e
1 parent c087efd
commit fd4b61e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/LCT.Common/FileOperations.cs b/src/LCT.Common/FileOperations.cs
@@ -102,7 +102,7 @@ public Bom CombineComponentsFromExistingBOM(Bom components, string filePath)
 
                     comparisonData.Components = comparisonData.Components?.GroupBy(x => new { x.Name, x.Version }).Select(y => y.First()).ToList();
 
-                    if (comparisonData.Dependencies.Count > 0)
+                    if (comparisonData.Dependencies != null && comparisonData.Dependencies.Count > 0)
                     {
                         comparisonData.Dependencies.AddRange(components.Dependencies);
                     }

diff --git a/src/LCT.PackageIdentifier/NugetDevDependencyParser.cs b/src/LCT.PackageIdentifier/NugetDevDependencyParser.cs
@@ -44,7 +44,9 @@ public static NugetDevDependencyParser Instance
             }
         }
 
-        public static List<Container> Parse(string configFile)
+#pragma warning disable CA1822 // Mark members as static
+        public List<Container> Parse(string configFile)
+#pragma warning restore CA1822 // Mark members as static
         {
             List<Container> containerList = new();
 

diff --git a/src/LCT.PackageIdentifier/NugetProcessor.cs b/src/LCT.PackageIdentifier/NugetProcessor.cs
@@ -619,7 +619,8 @@ private static string ReferenceTagDetailsForPackageReference(XmlNode childNode,
 
         private static List<NugetPackage> ParseAssetFile(string configFile)
         {
-            List<Container> containers = NugetDevDependencyParser.Parse(configFile);
+            NugetDevDependencyParser nugetDevDependencyParser = NugetDevDependencyParser.Instance;
+            List<Container> containers = nugetDevDependencyParser.Parse(configFile);
             return ConvertContainerAsNugetPackage(containers, configFile);
         }