Fix several enum serializations

Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
CycloneDX · Sep 1, 2024 · 505e0f3 · 505e0f3
1 parent e6ebe0c
commit 505e0f3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/CycloneDX.Core/Json/Utils.cs b/src/CycloneDX.Core/Json/Utils.cs
@@ -82,7 +82,7 @@ public static JsonSerializerOptions GetJsonSerializerOptions()
             options.Converters.Add(new EnumMemberConverter<ImplementationPlatform>());
             options.Converters.Add(new EvidenceIdentityListConverter());
 
-            options.Converters.Add(new HyphenEnumConverter<EvidenceIdentity.EvidenceFieldType>());
+            options.Converters.Add(new EnumMemberConverter<EvidenceIdentity.EvidenceFieldType>());
             options.Converters.Add(new HyphenEnumConverter<EvidenceMethods.EvidenceTechnique>());
             options.Converters.Add(new ScoreMethodConverter());
             options.Converters.Add(new HyphenEnumConverter<Severity>());

diff --git a/src/CycloneDX.Core/Models/AlgorithmProperties.cs b/src/CycloneDX.Core/Models/AlgorithmProperties.cs
@@ -388,7 +388,7 @@ public enum ExecutionEnvironment
         [XmlEnum("software-plain-ram")]
         Software_Plain_Ram,
         [XmlEnum("software-encrypted-ram")]
-        Software_Encypted_Ram,
+        Software_Encrypted_Ram,
         [XmlEnum("software-tee")]
         Software_TEE,
         [XmlEnum("hardware")]
@@ -403,7 +403,7 @@ public enum Primitive
         [XmlEnum("other")]
         Other,
         [XmlEnum("drbg")]
-        DRGB,
+        DRBG,
         [XmlEnum("mac")]
         MAC,
         [XmlEnum("block-cipher")]

diff --git a/src/CycloneDX.Core/Models/Data.cs b/src/CycloneDX.Core/Models/Data.cs
@@ -31,7 +31,7 @@ public class Data
         public enum DataType
         {
             [XmlEnum(Name = "source-code")]
-            SourceCode,
+            Source_Code,
             [XmlEnum(Name = "configuration")]
             Configuration,
             [XmlEnum(Name = "dataset")]

diff --git a/src/CycloneDX.Core/Models/EvidenceIdentity.cs b/src/CycloneDX.Core/Models/EvidenceIdentity.cs
@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
+using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using System.Xml;
 using System.Xml.Serialization;
@@ -50,6 +51,7 @@ public enum EvidenceFieldType
             [XmlEnum(Name = "hash")]
             Hash,
             [XmlEnum(Name = "omniborId")]
+            [EnumMember(Value = "omniborId")]
             OmniborId,
             [XmlEnum(Name = "swhid")]
             Swhid,

diff --git a/src/CycloneDX.Core/Models/ModelCard.cs b/src/CycloneDX.Core/Models/ModelCard.cs
@@ -35,12 +35,12 @@ public enum ModelParameterApproachType
             Supervised,
             [XmlEnum(Name = "unsupervised")]
             Unsupervised,
-            [XmlEnum(Name = "reinforced-learning")]
-            ReinforcedLearning,
+            [XmlEnum(Name = "reinforcement-learning")]
+            Reinforcement_Learning,
             [XmlEnum(Name = "semi-supervised")]
-            SemiSupervised,
+            Semi_Supervised,
             [XmlEnum(Name = "self-supervised")]
-            SelfSupervised,
+            Self_Supervised,
         }
 
         [ProtoContract]