Merge pull request #140 from CycloneDX/json-deserialization-regression

coderpatros · web-flow · commit 20a1247c92ce · 2021-06-05T08:38:44.000+10:00
Bump CycloneDX libraries to 2.2.1 to fix JSON deserialization regression
diff --git a/cyclonedx/Commands/MergeCommand.cs b/cyclonedx/Commands/MergeCommand.cs
@@ -111,6 +111,7 @@ public static async Task<int> Merge(MergeCommandOptions options)
                 }
 
                 outputBom = CycloneDXUtils.Merge(outputBom, inputBom);
+                outputBom.Version = 1;
                 if (inputBom.Components != null && !outputToConsole)
                     Console.WriteLine($"    Contains {inputBom.Components.Count} components");
             }
diff --git a/cyclonedx/CsvSerializer.cs b/cyclonedx/CsvSerializer.cs
@@ -145,6 +145,7 @@ public static Bom Deserialize(string csv)
             using (var csvReader = new CsvReader(reader, csvConfig))
             {
                 var bom = new Bom();
+                bom.Version = 1;
                 bom.Components = new List<Component>();
 
                 csvReader.Read();
diff --git a/cyclonedx/cyclonedx.csproj b/cyclonedx/cyclonedx.csproj
@@ -17,8 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="27.1.0" />
-    <PackageReference Include="CycloneDX.Core" Version="2.1.0" />
-    <PackageReference Include="CycloneDX.Utils" Version="2.1.0" />
+    <PackageReference Include="CycloneDX.Core" Version="2.2.1" />
+    <PackageReference Include="CycloneDX.Utils" Version="2.2.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ public static async Task<int> Merge(MergeCommandOptions options)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`outputBom = CycloneDXUtils.Merge(outputBom, inputBom);`
	`114`	`+ outputBom.Version = 1;`
`114`	`115`	`if (inputBom.Components != null && !outputToConsole)`
`115`	`116`	`Console.WriteLine($" Contains {inputBom.Components.Count} components");`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ public static Bom Deserialize(string csv)`
`145`	`145`	`using (var csvReader = new CsvReader(reader, csvConfig))`
`146`	`146`	`{`
`147`	`147`	`var bom = new Bom();`
	`148`	`+ bom.Version = 1;`
`148`	`149`	`bom.Components = new List<Component>();`
`149`	`150`
`150`	`151`	`csvReader.Read();`