Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump CycloneDX-Library to version 8.0.0 #400

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Bump CycloneDX-Library to version 8.0.0 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ed80e
Bump CycloneDX-Library to version 8.0.0
mtsfoni Sep 16, 2024
82abfd6
fix: suppress warnings
mtsfoni Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion semver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.26.0
0.27.0
6 changes: 5 additions & 1 deletion src/cyclonedx/Serialization/CsvSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/cyclonedx/cyclonedx.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ....tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ....tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ....tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Binary file modified ...dx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.cdx_autodetect_.snap
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...edx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -134,7 +134,7 @@
"uid": "123",
"url": "",
"author": {
"timestamp": "2018-11-13T20:20:39Z",
"timestamp": "2067-09-26T16:41:18Z",
"name": "",
"email": ""
}
Expand Down
2 changes: 1 addition & 1 deletion ...ests/__snapshots__/ConvertTests.Convert_bom-1.3.json_autodetect_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
Binary file modified ...edx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.cdx_protobuf_v1_3.snap
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion .../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ....tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion .../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ....tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ...nedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion .../cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"specVersion": "1.6",
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
"version": 1,
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion ....tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...onedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...x.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...edx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...dx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...clonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...onedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...shots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5", "version": 1,
"specVersion": "1.6", "version": 1,
"metadata": {
"component": {
"type": "application",
Expand Down
2 changes: 1 addition & 1 deletion ...__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5", "version": 1,
"specVersion": "1.6", "version": 1,
"metadata": {
"component": {
"type": "application",
Expand Down
Loading
Loading