EnumMemberAttribute #20

GuOrg · Sep 12, 2018 · 301925f · 301925f
1 parent 65b4a4c
commit 301925f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Gu.Xml.Tests/XmlTests.SerializeWithDataContractAttributes.cs b/Gu.Xml.Tests/XmlTests.SerializeWithDataContractAttributes.cs
@@ -23,6 +23,8 @@ public class SerializeWithDataContractAttributes
                 new TestCaseData(new FieldWithIgnoreDataMemberAttribute { Value = 1 }),
                 new TestCaseData(new FieldWithDataMemberAttribute { Value = 1 }),
                 new TestCaseData(new FieldWithDataMemberAttributeExplicitName { Value = 1 }),
+                new TestCaseData(new WithWithEnumMemberAttribute { Value = WithEnumMemberAttribute.One }),
+                new TestCaseData(new WithWithEnumMemberAttribute { Value = WithEnumMemberAttribute.Two }),
             };
 
             [TestCaseSource(nameof(Values))]
@@ -117,6 +119,20 @@ public class FieldWithIgnoreDataMemberAttribute
                 [IgnoreDataMember]
                 public int Value { get; set; }
             }
+
+            public class WithWithEnumMemberAttribute
+            {
+                public WithEnumMemberAttribute Value { get; set; }
+            }
+
+            [DataContract]
+            public enum WithEnumMemberAttribute
+            {
+                [EnumMember(Value = "Single")]
+                One,
+                [EnumMember(Value = "Double")]
+                Two,
+            }
         }
     }
 }
diff --git a/Gu.Xml/Writers/EnumWriter{T}.cs b/Gu.Xml/Writers/EnumWriter{T}.cs
@@ -48,7 +48,8 @@ private string ToString(T value)
             if (typeof(T).GetMember(value.ToString()).TryFirst(out var member))
             {
                 if (TryGetNameFromAttribute<System.Xml.Serialization.XmlEnumAttribute>(member, x => x.Name, out var name) ||
-                    TryGetNameFromAttribute<System.Xml.Serialization.SoapEnumAttribute>(member, x => x.Name, out name))
+                    TryGetNameFromAttribute<System.Xml.Serialization.SoapEnumAttribute>(member, x => x.Name, out name) ||
+                    TryGetNameFromAttribute<System.Runtime.Serialization.EnumMemberAttribute>(member, x => x.Value, out name))
                 {
                     return name;
                 }