Skip to content

Commit 41ec328

Browse files
mtsfonimtsfoni
authored
build(deps): upgrade CycloneDX.Core from 11.0.0 to 12.0.1 (#1055)
* build(deps): upgrade CycloneDX.Core from 11.0.0 to 12.0.1 Generated by construct Signed-off-by: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com> * build(deps): regenerate lock files for CycloneDX.Core 12.0.1 upgrade Signed-off-by: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com> Generated by construct * test(e2e): fix AutoVerify always silencing snapshot mismatches in CI VerifierSettings.AutoVerify() was called unconditionally, so snapshot divergences were silently accepted rather than failing the test run. Guard it behind a CI env-var check so snapshots must match in CI. Also update the MetadataToolTests snapshot for CycloneDX.Core 12.0.1: - default spec version bumped to 1.7 Signed-off-by: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com> Generated by construct --------- Signed-off-by: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com>
1 parent 469df8f commit 41ec328

File tree

5 files changed

+146
-147
lines changed

5 files changed

+146
-147
lines changed

‎CycloneDX.E2ETests/Infrastructure/VerifyConfig.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@ public static class VerifyConfig
3636
[ModuleInitializer]
3737
public static void Initialize()
3838
{
39-
// Auto-accept snapshots when they don't exist yet (first run).
40-
// Set VERIFY_DISABLE_CLIP=1 in CI to prevent clipboard usage.
41-
VerifierSettings.AutoVerify();
39+
// Auto-accept snapshots locally so the first run creates them without failing.
40+
// In CI (detected via the CI environment variable) snapshots must already match;
41+
// any divergence is a real test failure.
42+
var isCI = !string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("CI"));
43+
if (!isCI)
44+
{
45+
VerifierSettings.AutoVerify();
46+
}
4247

4348
// Store snapshots in the Snapshots/ subfolder of the project directory
4449
Verifier.DerivePathInfo(

‎CycloneDX.E2ETests/Snapshots/MetadataToolTests.ToolMetadata_IsRecordedAsComponent_NotDeprecatedTool.verified.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:{scrubbed}" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
2+
<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:{scrubbed}" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
33
<metadata>
44
<timestamp>{scrubbed-timestamp}</timestamp>
55
<tools>
@@ -37,7 +37,7 @@
3737
<description>Test package TestPkg.A</description>
3838
<scope>required</scope>
3939
<hashes>
40-
<hash alg="SHA-512">{scrubbed-hash}531C6F999C3D7E54935AF23D43D1F34E34F13C64</hash>
40+
<hash alg="SHA-512">{scrubbed-hash}</hash>
4141
</hashes>
4242
<licenses>
4343
<license>

‎CycloneDX.Tests/packages.lock.json‎

Lines changed: 69 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,31 @@
6767
"System.Diagnostics.EventLog": "6.0.0"
6868
}
6969
},
70-
"JetBrains.Annotations": {
70+
"Humanizer.Core": {
7171
"type": "Transitive",
72-
"resolved": "2021.2.0",
73-
"contentHash": "kKSyoVfndMriKHLfYGmr0uzQuI4jcc3TKGyww7buJFCYeHb/X0kodYBPL7n9454q7v6ASiRmDgpPGaDGerg/Hg=="
72+
"resolved": "3.0.1",
73+
"contentHash": "scB3+KcxNmEjZK5V8rKCW2gIiL8m8KH91w14FuuExyhi9xTyAJ+jr+DDxGdy12mHmioe2uvjxTfMgM7WmSUFlw=="
7474
},
7575
"Json.More.Net": {
7676
"type": "Transitive",
77-
"resolved": "1.9.0",
78-
"contentHash": "MMjd2dOh32hLbcZg9YyA+7aEH9gu2cMTEAWrQY17in4+aEsPg2NtYTcwgWHJS9Tt2WUx+4iN1mNegR2uiEwsVQ=="
77+
"resolved": "3.0.0",
78+
"contentHash": "+kj2dE04clW9+Bw4GoEVBFdLSiOKwLEkiiGbX+CK860DbytCtpD0QA68cEQISMnIrxyxQPw5gQAra22WCnRPUA=="
7979
},
8080
"JsonPointer.Net": {
8181
"type": "Transitive",
82-
"resolved": "3.0.3",
83-
"contentHash": "mCGQc15lHLp1R2CVhWiipnZurHXm93+LbPPAT/vXQm5PdHt6WQuYLhaEF8VZ+aXL9P2I6bGND6pDTEfqFs6gig==",
82+
"resolved": "7.0.0",
83+
"contentHash": "jdnFo5huuJDB3ASWIkD0F9Ntf+9nOtRbsIp4VqRlHbTW9LxpBBMRKQhQJxPtIFAhNVS55aAsMb78TB+LK29CqQ==",
8484
"dependencies": {
85-
"Json.More.Net": "1.8.0"
85+
"Humanizer.Core": "3.0.1",
86+
"Json.More.Net": "3.0.0"
8687
}
8788
},
8889
"JsonSchema.Net": {
8990
"type": "Transitive",
90-
"resolved": "5.3.1",
91-
"contentHash": "1Ox9kMtire1U1O+obAKGbO8i8MAWbRTKDBda1GpNaEN6sxQUFD7h9laBZ1WmXFVbsv9grTBFfYJi/I/5zoPvsQ==",
91+
"resolved": "9.1.1",
92+
"contentHash": "WWUFdqByMmgDxo4UQ70bf1ORTqZuzFLxk6fdLlOrMwuLjGjn4ugtidS79qNcjtzkZ6u4sLoEKvGMp6Siwax6tA==",
9293
"dependencies": {
93-
"JetBrains.Annotations": "2021.2.0",
94-
"Json.More.Net": "1.9.0",
95-
"JsonPointer.Net": "3.0.3"
94+
"JsonPointer.Net": "7.0.0"
9695
}
9796
},
9897
"Microsoft.CodeCoverage": {
@@ -178,16 +177,16 @@
178177
},
179178
"protobuf-net": {
180179
"type": "Transitive",
181-
"resolved": "3.2.45",
182-
"contentHash": "5UZ/ukUHcGbFSl7vNMrHsfjqdxusdd9w7w0fCEXzf3UUtsrGNVCzV5SmF+sCHAbnRV2qPcD1ixiDP7Aj8lX/HA==",
180+
"resolved": "3.2.56",
181+
"contentHash": "4IPJeTYAMNewlN8MDaFkcmR/9hLhJeo9eARnTh104zh7mf+vXT2gu5MUfUnkSQU+CH578Q6vcdU7LQDQPG6eaw==",
183182
"dependencies": {
184-
"protobuf-net.Core": "3.2.45"
183+
"protobuf-net.Core": "3.2.56"
185184
}
186185
},
187186
"protobuf-net.Core": {
188187
"type": "Transitive",
189-
"resolved": "3.2.45",
190-
"contentHash": "PMWatW2NrT1uTXD7etJ4VdQ0wWZLFrIfdRGppD2QX7nzZ0+kIzqhq551u6ZiXJHWJgG4hWFEkSnUnt2aB6posg=="
188+
"resolved": "3.2.56",
189+
"contentHash": "d6QOukTpDzs7zZv9tPnBZMtvHDNeHJQXUhMx54g4urUQsXK3oo9U70H9HvklYq7hlQ4A7AHJl7EVEqyCXXIl8Q=="
191190
},
192191
"System.Diagnostics.EventLog": {
193192
"type": "Transitive",
@@ -277,7 +276,7 @@
277276
"cyclonedx": {
278277
"type": "Project",
279278
"dependencies": {
280-
"CycloneDX.Core": "[11.0.0, )",
279+
"CycloneDX.Core": "[12.0.1, )",
281280
"NuGet.ProjectModel": "[7.0.1, )",
282281
"NuGet.Protocol": "[7.0.1, )",
283282
"System.CommandLine": "[2.0.0, )",
@@ -286,12 +285,12 @@
286285
},
287286
"CycloneDX.Core": {
288287
"type": "CentralTransitive",
289-
"requested": "[11.0.0, )",
290-
"resolved": "11.0.0",
291-
"contentHash": "7W4Eo9p3hGYZm3nniT3aSOdE4OZmDtKbWKs6oHEP09x+yjbp1IJaXDhmzGstvN6TaQy+MDjI4/WcVHricog1sQ==",
288+
"requested": "[12.0.1, )",
289+
"resolved": "12.0.1",
290+
"contentHash": "m2N2iD7LCX6JJ8iyAM9mkb1DwuxztriEhfnzBf7PKN/OmqboWCbjmfh0Wn+XsD5DeWN19K0mOCS8mwYIn0Ohbw==",
292291
"dependencies": {
293-
"JsonSchema.Net": "5.3.1",
294-
"protobuf-net": "3.2.45"
292+
"JsonSchema.Net": "9.1.1",
293+
"protobuf-net": "3.2.56"
295294
}
296295
},
297296
"NuGet.ProjectModel": {
@@ -395,32 +394,31 @@
395394
"System.Diagnostics.EventLog": "6.0.0"
396395
}
397396
},
398-
"JetBrains.Annotations": {
397+
"Humanizer.Core": {
399398
"type": "Transitive",
400-
"resolved": "2021.2.0",
401-
"contentHash": "kKSyoVfndMriKHLfYGmr0uzQuI4jcc3TKGyww7buJFCYeHb/X0kodYBPL7n9454q7v6ASiRmDgpPGaDGerg/Hg=="
399+
"resolved": "2.14.1",
400+
"contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw=="
402401
},
403402
"Json.More.Net": {
404403
"type": "Transitive",
405-
"resolved": "1.9.0",
406-
"contentHash": "MMjd2dOh32hLbcZg9YyA+7aEH9gu2cMTEAWrQY17in4+aEsPg2NtYTcwgWHJS9Tt2WUx+4iN1mNegR2uiEwsVQ=="
404+
"resolved": "3.0.0",
405+
"contentHash": "+kj2dE04clW9+Bw4GoEVBFdLSiOKwLEkiiGbX+CK860DbytCtpD0QA68cEQISMnIrxyxQPw5gQAra22WCnRPUA=="
407406
},
408407
"JsonPointer.Net": {
409408
"type": "Transitive",
410-
"resolved": "3.0.3",
411-
"contentHash": "mCGQc15lHLp1R2CVhWiipnZurHXm93+LbPPAT/vXQm5PdHt6WQuYLhaEF8VZ+aXL9P2I6bGND6pDTEfqFs6gig==",
409+
"resolved": "7.0.0",
410+
"contentHash": "jdnFo5huuJDB3ASWIkD0F9Ntf+9nOtRbsIp4VqRlHbTW9LxpBBMRKQhQJxPtIFAhNVS55aAsMb78TB+LK29CqQ==",
412411
"dependencies": {
413-
"Json.More.Net": "1.8.0"
412+
"Humanizer.Core": "2.14.1",
413+
"Json.More.Net": "3.0.0"
414414
}
415415
},
416416
"JsonSchema.Net": {
417417
"type": "Transitive",
418-
"resolved": "5.3.1",
419-
"contentHash": "1Ox9kMtire1U1O+obAKGbO8i8MAWbRTKDBda1GpNaEN6sxQUFD7h9laBZ1WmXFVbsv9grTBFfYJi/I/5zoPvsQ==",
418+
"resolved": "9.1.1",
419+
"contentHash": "WWUFdqByMmgDxo4UQ70bf1ORTqZuzFLxk6fdLlOrMwuLjGjn4ugtidS79qNcjtzkZ6u4sLoEKvGMp6Siwax6tA==",
420420
"dependencies": {
421-
"JetBrains.Annotations": "2021.2.0",
422-
"Json.More.Net": "1.9.0",
423-
"JsonPointer.Net": "3.0.3"
421+
"JsonPointer.Net": "7.0.0"
424422
}
425423
},
426424
"Microsoft.Bcl.Cryptography": {
@@ -514,16 +512,16 @@
514512
},
515513
"protobuf-net": {
516514
"type": "Transitive",
517-
"resolved": "3.2.45",
518-
"contentHash": "5UZ/ukUHcGbFSl7vNMrHsfjqdxusdd9w7w0fCEXzf3UUtsrGNVCzV5SmF+sCHAbnRV2qPcD1ixiDP7Aj8lX/HA==",
515+
"resolved": "3.2.56",
516+
"contentHash": "4IPJeTYAMNewlN8MDaFkcmR/9hLhJeo9eARnTh104zh7mf+vXT2gu5MUfUnkSQU+CH578Q6vcdU7LQDQPG6eaw==",
519517
"dependencies": {
520-
"protobuf-net.Core": "3.2.45"
518+
"protobuf-net.Core": "3.2.56"
521519
}
522520
},
523521
"protobuf-net.Core": {
524522
"type": "Transitive",
525-
"resolved": "3.2.45",
526-
"contentHash": "PMWatW2NrT1uTXD7etJ4VdQ0wWZLFrIfdRGppD2QX7nzZ0+kIzqhq551u6ZiXJHWJgG4hWFEkSnUnt2aB6posg=="
523+
"resolved": "3.2.56",
524+
"contentHash": "d6QOukTpDzs7zZv9tPnBZMtvHDNeHJQXUhMx54g4urUQsXK3oo9U70H9HvklYq7hlQ4A7AHJl7EVEqyCXXIl8Q=="
527525
},
528526
"System.Diagnostics.EventLog": {
529527
"type": "Transitive",
@@ -622,7 +620,7 @@
622620
"cyclonedx": {
623621
"type": "Project",
624622
"dependencies": {
625-
"CycloneDX.Core": "[11.0.0, )",
623+
"CycloneDX.Core": "[12.0.1, )",
626624
"NuGet.ProjectModel": "[7.0.1, )",
627625
"NuGet.Protocol": "[7.0.1, )",
628626
"System.CommandLine": "[2.0.0, )",
@@ -631,12 +629,12 @@
631629
},
632630
"CycloneDX.Core": {
633631
"type": "CentralTransitive",
634-
"requested": "[11.0.0, )",
635-
"resolved": "11.0.0",
636-
"contentHash": "7W4Eo9p3hGYZm3nniT3aSOdE4OZmDtKbWKs6oHEP09x+yjbp1IJaXDhmzGstvN6TaQy+MDjI4/WcVHricog1sQ==",
632+
"requested": "[12.0.1, )",
633+
"resolved": "12.0.1",
634+
"contentHash": "m2N2iD7LCX6JJ8iyAM9mkb1DwuxztriEhfnzBf7PKN/OmqboWCbjmfh0Wn+XsD5DeWN19K0mOCS8mwYIn0Ohbw==",
637635
"dependencies": {
638-
"JsonSchema.Net": "5.3.1",
639-
"protobuf-net": "3.2.45"
636+
"JsonSchema.Net": "9.1.1",
637+
"protobuf-net": "3.2.56"
640638
}
641639
},
642640
"NuGet.ProjectModel": {
@@ -740,32 +738,31 @@
740738
"System.Diagnostics.EventLog": "6.0.0"
741739
}
742740
},
743-
"JetBrains.Annotations": {
741+
"Humanizer.Core": {
744742
"type": "Transitive",
745-
"resolved": "2021.2.0",
746-
"contentHash": "kKSyoVfndMriKHLfYGmr0uzQuI4jcc3TKGyww7buJFCYeHb/X0kodYBPL7n9454q7v6ASiRmDgpPGaDGerg/Hg=="
743+
"resolved": "3.0.1",
744+
"contentHash": "scB3+KcxNmEjZK5V8rKCW2gIiL8m8KH91w14FuuExyhi9xTyAJ+jr+DDxGdy12mHmioe2uvjxTfMgM7WmSUFlw=="
747745
},
748746
"Json.More.Net": {
749747
"type": "Transitive",
750-
"resolved": "1.9.0",
751-
"contentHash": "MMjd2dOh32hLbcZg9YyA+7aEH9gu2cMTEAWrQY17in4+aEsPg2NtYTcwgWHJS9Tt2WUx+4iN1mNegR2uiEwsVQ=="
748+
"resolved": "3.0.0",
749+
"contentHash": "+kj2dE04clW9+Bw4GoEVBFdLSiOKwLEkiiGbX+CK860DbytCtpD0QA68cEQISMnIrxyxQPw5gQAra22WCnRPUA=="
752750
},
753751
"JsonPointer.Net": {
754752
"type": "Transitive",
755-
"resolved": "3.0.3",
756-
"contentHash": "mCGQc15lHLp1R2CVhWiipnZurHXm93+LbPPAT/vXQm5PdHt6WQuYLhaEF8VZ+aXL9P2I6bGND6pDTEfqFs6gig==",
753+
"resolved": "7.0.0",
754+
"contentHash": "jdnFo5huuJDB3ASWIkD0F9Ntf+9nOtRbsIp4VqRlHbTW9LxpBBMRKQhQJxPtIFAhNVS55aAsMb78TB+LK29CqQ==",
757755
"dependencies": {
758-
"Json.More.Net": "1.8.0"
756+
"Humanizer.Core": "3.0.1",
757+
"Json.More.Net": "3.0.0"
759758
}
760759
},
761760
"JsonSchema.Net": {
762761
"type": "Transitive",
763-
"resolved": "5.3.1",
764-
"contentHash": "1Ox9kMtire1U1O+obAKGbO8i8MAWbRTKDBda1GpNaEN6sxQUFD7h9laBZ1WmXFVbsv9grTBFfYJi/I/5zoPvsQ==",
762+
"resolved": "9.1.1",
763+
"contentHash": "WWUFdqByMmgDxo4UQ70bf1ORTqZuzFLxk6fdLlOrMwuLjGjn4ugtidS79qNcjtzkZ6u4sLoEKvGMp6Siwax6tA==",
765764
"dependencies": {
766-
"JetBrains.Annotations": "2021.2.0",
767-
"Json.More.Net": "1.9.0",
768-
"JsonPointer.Net": "3.0.3"
765+
"JsonPointer.Net": "7.0.0"
769766
}
770767
},
771768
"Microsoft.CodeCoverage": {
@@ -851,16 +848,16 @@
851848
},
852849
"protobuf-net": {
853850
"type": "Transitive",
854-
"resolved": "3.2.45",
855-
"contentHash": "5UZ/ukUHcGbFSl7vNMrHsfjqdxusdd9w7w0fCEXzf3UUtsrGNVCzV5SmF+sCHAbnRV2qPcD1ixiDP7Aj8lX/HA==",
851+
"resolved": "3.2.56",
852+
"contentHash": "4IPJeTYAMNewlN8MDaFkcmR/9hLhJeo9eARnTh104zh7mf+vXT2gu5MUfUnkSQU+CH578Q6vcdU7LQDQPG6eaw==",
856853
"dependencies": {
857-
"protobuf-net.Core": "3.2.45"
854+
"protobuf-net.Core": "3.2.56"
858855
}
859856
},
860857
"protobuf-net.Core": {
861858
"type": "Transitive",
862-
"resolved": "3.2.45",
863-
"contentHash": "PMWatW2NrT1uTXD7etJ4VdQ0wWZLFrIfdRGppD2QX7nzZ0+kIzqhq551u6ZiXJHWJgG4hWFEkSnUnt2aB6posg=="
859+
"resolved": "3.2.56",
860+
"contentHash": "d6QOukTpDzs7zZv9tPnBZMtvHDNeHJQXUhMx54g4urUQsXK3oo9U70H9HvklYq7hlQ4A7AHJl7EVEqyCXXIl8Q=="
864861
},
865862
"System.Diagnostics.EventLog": {
866863
"type": "Transitive",
@@ -950,7 +947,7 @@
950947
"cyclonedx": {
951948
"type": "Project",
952949
"dependencies": {
953-
"CycloneDX.Core": "[11.0.0, )",
950+
"CycloneDX.Core": "[12.0.1, )",
954951
"NuGet.ProjectModel": "[7.0.1, )",
955952
"NuGet.Protocol": "[7.0.1, )",
956953
"System.CommandLine": "[2.0.0, )",
@@ -959,12 +956,12 @@
959956
},
960957
"CycloneDX.Core": {
961958
"type": "CentralTransitive",
962-
"requested": "[11.0.0, )",
963-
"resolved": "11.0.0",
964-
"contentHash": "7W4Eo9p3hGYZm3nniT3aSOdE4OZmDtKbWKs6oHEP09x+yjbp1IJaXDhmzGstvN6TaQy+MDjI4/WcVHricog1sQ==",
959+
"requested": "[12.0.1, )",
960+
"resolved": "12.0.1",
961+
"contentHash": "m2N2iD7LCX6JJ8iyAM9mkb1DwuxztriEhfnzBf7PKN/OmqboWCbjmfh0Wn+XsD5DeWN19K0mOCS8mwYIn0Ohbw==",
965962
"dependencies": {
966-
"JsonSchema.Net": "5.3.1",
967-
"protobuf-net": "3.2.45"
963+
"JsonSchema.Net": "9.1.1",
964+
"protobuf-net": "3.2.56"
968965
}
969966
},
970967
"NuGet.ProjectModel": {

0 commit comments

Comments
 (0)