Bump CycloneDX-Library to version 8.0.0 (#400)

Signed-off-by: MTsfoni <[email protected]>
CycloneDX · Sep 16, 2024 · f2ebd73 · f2ebd73
1 parent 4f578ad
commit f2ebd73
Show file tree

Hide file tree

Showing 55 changed files with 99 additions and 61 deletions.
diff --git a/semver.txt b/semver.txt
@@ -1 +1 @@
-0.26.0
+0.27.0
diff --git a/src/cyclonedx/Serialization/CsvSerializer.cs b/src/cyclonedx/Serialization/CsvSerializer.cs
@@ -1,4 +1,4 @@
-// This file is part of CycloneDX CLI Tool
+// This file is part of CycloneDX CLI Tool
 //
 // Licensed under the Apache License, Version 2.0 (the “License”);
 // you may not use this file except in compliance with the License.
@@ -76,7 +76,9 @@ public static string Serialize(Bom bom)
                         csv.WriteField(c.Type);
                         csv.WriteField(c.MimeType);
                         csv.WriteField(c.Supplier?.Name);
+#pragma warning disable CS0618 // Type or member is obsolete
                         csv.WriteField(c.Author);
+#pragma warning restore CS0618 // Type or member is obsolete
                         csv.WriteField(c.Publisher);
                         csv.WriteField(c.Group);
                         csv.WriteField(c.Name);
@@ -151,6 +153,7 @@ public static Bom Deserialize(string csv)
                 csvReader.ReadHeader();
                 while (csvReader.Read())
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     var component = new Component
                     {
                         Type = csvReader.GetField<Component.Classification?>("Type") ?? Component.Classification.Library,
@@ -190,6 +193,7 @@ public static Bom Deserialize(string csv)
                         // external references not supported
                         // sub-components not supported
                     };
+#pragma warning restore CS0618 // Type or member is obsolete
                     if (component.Supplier.Name == null) component.Supplier = null;
                     if (component.Swid.Text.Content == null) component.Swid.Text = null;
                     if (component.Swid.TagId == null) component.Swid = null;

diff --git a/src/cyclonedx/cyclonedx.csproj b/src/cyclonedx/cyclonedx.csproj
@@ -15,8 +15,8 @@
   <ItemGroup>
     <PackageReference Include="CoderPatros.AntPathMatching" Version="0.1.1" />
     <PackageReference Include="CsvHelper" Version="29.0.0" />
-    <PackageReference Include="CycloneDX.Utils" Version="7.1.0" />
-    <PackageReference Include="CycloneDX.Spdx.Interop" Version="7.1.0" />
+    <PackageReference Include="CycloneDX.Utils" Version="8.0.0" />
+    <PackageReference Include="CycloneDX.Spdx.Interop" Version="8.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" />
   </ItemGroup>

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2010-01-29T18:30:22Z</timestamp>
     <tools>

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2010-01-29T18:30:22Z</timestamp>
     <tools>

diff --git a/....tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap b/....tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <group>org.example</group>

diff --git a/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap b/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <group>org.example</group>

diff --git a/....tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap b/....tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>

diff --git a/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap b/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>

diff --git a/...ests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap b/...ests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap b/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/....tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap b/....tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>Test</name>

diff --git a/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap b/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>Test</name>

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>Test</name>

diff --git a/...dx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.cdx_autodetect_.snap b/...dx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.cdx_autodetect_.snap
diff --git a/...edx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap b/...edx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap
@@ -4,7 +4,7 @@
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {
-    "timestamp": "2020-04-13T20:20:39Z",
+    "timestamp": "2070-07-26T16:41:18Z",
     "tools": [
       {
         "vendor": "Awesome Vendor",
@@ -134,7 +134,7 @@
             "uid": "123",
             "url": "",
             "author": {
-              "timestamp": "2018-11-13T20:20:39Z",
+              "timestamp": "2067-09-26T16:41:18Z",
               "name": "",
               "email": ""
             }

diff --git a/...ests/__snapshots__/ConvertTests.Convert_bom-1.3.json_autodetect_bom.json_autodetect_.snap b/...ests/__snapshots__/ConvertTests.Convert_bom-1.3.json_autodetect_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/...edx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.cdx_protobuf_v1_3.snap b/...edx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.cdx_protobuf_v1_3.snap
diff --git a/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap b/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/.../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap b/.../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/....tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap b/....tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap b/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/...ests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap b/...ests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap b/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/.../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap b/.../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/....tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap b/....tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap b/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/...ests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap b/...ests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap b/...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/.../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap b/.../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",
+  "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {

diff --git a/....tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap b/....tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap b/...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>

diff --git a/...ests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap b/...ests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>Microsoft.Win32.Primitives</name>

diff --git a/...onedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap b/...onedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>Microsoft.Win32.Primitives</name>

diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>CycloneDX.Core</name>

diff --git a/...x.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap b/...x.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>acme-example</name>

diff --git a/...ests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap b/...ests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <author>Acme Super Heros</author>

diff --git a/...edx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap b/...edx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <author>Acme Super Heros</author>

diff --git a/...dx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap b/...dx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <name>application-a</name>

diff --git a/...tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap b/...tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>

diff --git a/...clonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap b/...clonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>

diff --git a/...onedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap b/...onedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>

diff --git a/...shots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap b/...shots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",  "version": 1,
+  "specVersion": "1.6",  "version": 1,
   "metadata": {
     "component": {
       "type": "application",

diff --git a/...__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap b/...__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap
@@ -1,6 +1,6 @@
 {
   "bomFormat": "CycloneDX",
-  "specVersion": "1.5",  "version": 1,
+  "specVersion": "1.6",  "version": 1,
   "metadata": {
     "component": {
       "type": "application",