-Fixed serializing F# enums

JamesNK · Mar 23, 2018 · c4af75c · c4af75c
1 parent cfdd84e
commit c4af75c
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 4 deletions.
diff --git a/...ewtonsoft.Json.Tests/Documentation/Samples/Serializer/NamingStrategySkipDictionaryKeys.cs b/...ewtonsoft.Json.Tests/Documentation/Samples/Serializer/NamingStrategySkipDictionaryKeys.cs
@@ -62,7 +62,7 @@ public void Example()
                 {
                     ["JamesNK"] = 9001,
                     ["JoC"] = 1337,
-                    ["JessicN"] = 1000
+                    ["JessicaN"] = 1000
                 }
             };
 
@@ -87,7 +87,7 @@ public void Example()
             //   "userPoints": {
             //     "JamesNK": 9001,
             //     "JoC": 1337,
-            //     "JessicN": 1000
+            //     "JessicaN": 1000
             //   }
             // }
             #endregion
@@ -98,7 +98,7 @@ public void Example()
   ""userPoints"": {
     ""JamesNK"": 9001,
     ""JoC"": 1337,
-    ""JessicN"": 1000
+    ""JessicaN"": 1000
   }
 }", json);
         }

diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue1642.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue1642.cs
@@ -0,0 +1,76 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+#if !(PORTABLE || PORTABLE40 || DNXCORE50)
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json.Utilities;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue1642 : TestFixtureBase
+    {
+        [Test]
+        public void Test()
+        {
+            AppDomain currentDomain = AppDomain.CurrentDomain;
+
+            AssemblyName aName = new AssemblyName("TempAssembly");
+            AssemblyBuilder ab = currentDomain.DefineDynamicAssembly(
+                aName, AssemblyBuilderAccess.RunAndSave);
+
+            ModuleBuilder mb = ab.DefineDynamicModule(aName.Name, aName.Name + ".dll");
+
+            TypeBuilder typeBuilder = mb.DefineType("TestEnum", TypeAttributes.NotPublic | TypeAttributes.Sealed, typeof(Enum));
+            typeBuilder.DefineField("value__", typeof(int), FieldAttributes.FamANDAssem | FieldAttributes.Family | FieldAttributes.SpecialName | FieldAttributes.RTSpecialName);
+
+            FieldBuilder fieldBuilder = typeBuilder.DefineField("TestValue", typeBuilder, FieldAttributes.Family | FieldAttributes.Static | FieldAttributes.Literal);
+            fieldBuilder.SetConstant(0);
+
+            Type enumType = typeBuilder.CreateType();
+
+            object o = Activator.CreateInstance(enumType);
+
+            string json = JsonConvert.SerializeObject(o, new JsonSerializerSettings { Converters = { new StringEnumConverter() } });
+            Assert.AreEqual(@"""TestValue""", json);
+        }
+    }
+}
+#endif
diff --git a/Src/Newtonsoft.Json/Utilities/EnumUtils.cs b/Src/Newtonsoft.Json/Utilities/EnumUtils.cs
@@ -54,7 +54,7 @@ private static EnumInfo InitializeValuesAndNames(Type enumType)
             for (int i = 0; i < names.Length; i++)
             {
                 string name = names[i];
-                FieldInfo f = enumType.GetField(name, BindingFlags.Public | BindingFlags.Static);
+                FieldInfo f = enumType.GetField(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
                 values[i] = ToUInt64(f.GetValue(null));
 
                 string resolvedName;