- Fixed #137

Signed-off-by: rpgmaker <[email protected]>

Author: rpgmaker

NetJSON.Core/Properties/AssemblyInfo.cs

@@ -24,5 +24,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.3")]
-[assembly: AssemblyFileVersion("1.2.1.3")]
+[assembly: AssemblyVersion("1.2.1.4")]
+[assembly: AssemblyFileVersion("1.2.1.4")]

NetJSON.Core/project.json

@@ -22,5 +22,5 @@
     }
   },
   "title": "NetJSON",
-  "version": "1.2.1.3"
+  "version": "1.2.1.4"
 }

NetJSON.Tests/SerializeTests.cs

@@ -233,6 +233,15 @@ public void NullableWithDefaultValueSetSerializes()
             Assert.AreEqual("{\"x\":0}", json);
         }
 
+        [TestMethod]
+        public void NonDefaultNullableValueSerializes()
+        {
+            var obj = new NullableTest { x = 5 };
+            var settings = new NetJSONSettings { SkipDefaultValue = true };
+            var json = NetJSON.Serialize(obj, settings);
+            Assert.AreEqual("{\"x\":5}", json);
+        }
+
         public class TestJSON {
             public List<Rec> d { get; set; }
             public List<int?> v { get; set; }

NetJSON/NetJSON.cs

@@ -2831,9 +2831,13 @@ internal static void WritePropertiesFor(TypeBuilder typeBuilder, Type type, ILGe
                 var skipDefaultValueTrueLabel = il.DefineLabel();
                 var skipDefaultValueFalseLabel = il.DefineLabel();
                 var skipDefaultValueTrueAndHasValueLabel = il.DefineLabel();
+                var successLocal = il.DeclareLocal(_boolType);
 
                 var hasValueMethod = isNullable ? originPropType.GetMethod("get_HasValue") : null;
 
+                il.Emit(OpCodes.Ldc_I4, 0);
+                il.Emit(OpCodes.Stloc, successLocal);
+
                 il.Emit(OpCodes.Ldloc, skipDefaultValue);
                 il.Emit(OpCodes.Brfalse, skipDefaultValueTrueLabel);
 
@@ -2878,16 +2882,24 @@ internal static void WritePropertiesFor(TypeBuilder typeBuilder, Type type, ILGe
 
                 WritePropertyForType(typeBuilder, il, hasValue, counter, nameLocal, propType, propValue);
 
+                il.Emit(OpCodes.Ldc_I4, 1);
+                il.Emit(OpCodes.Stloc, successLocal);
+
                 il.MarkLabel(propNullLabel);
 
                 il.MarkLabel(skipDefaultValueTrueLabel);
 
 
                 il.Emit(OpCodes.Ldloc, skipDefaultValue);
                 il.Emit(OpCodes.Brtrue, skipDefaultValueFalseLabel);
+                il.Emit(OpCodes.Ldloc, successLocal);
+                il.Emit(OpCodes.Brtrue, skipDefaultValueFalseLabel);
 
                 WritePropertyForType(typeBuilder, il, hasValue, counter, nameLocal, propType, propValue);
 
+                il.Emit(OpCodes.Ldc_I4, 1);
+                il.Emit(OpCodes.Stloc, successLocal);
+
                 il.MarkLabel(skipDefaultValueFalseLabel);
 
                 if (isNullable)
@@ -2897,6 +2909,8 @@ internal static void WritePropertiesFor(TypeBuilder typeBuilder, Type type, ILGe
                     il.Emit(OpCodes.Ldloca, nullablePropValue);
                     il.Emit(OpCodes.Call, hasValueMethod);
                     il.Emit(OpCodes.Brfalse, skipDefaultValueTrueAndHasValueLabel);
+                    il.Emit(OpCodes.Ldloc, successLocal);
+                    il.Emit(OpCodes.Brtrue, skipDefaultValueTrueAndHasValueLabel);
 
                     WritePropertyForType(typeBuilder, il, hasValue, counter, nameLocal, propType, propValue);
 

NetJSON/NetJSON.nuspec

@@ -4,13 +4,11 @@
     <id>NetJSON</id> 
     <title>NetJSON</title>
     <tags>json json-serializer javascript JSON serializer binary</tags>
-    <version>1.2.1.3</version> 
+    <version>1.2.1.4</version> 
     <authors>TJ Bakre</authors>
     <description>Faster than Any Binary?</description>
     <releaseNotes>
-      Added support for netstandard1.6
-      Fixed issue with skipping default value when nullable is used
-      Fixed issue with failure for date serialization due to missing "Z"
+      Fixed nullable issue with skip default option
     </releaseNotes>
     <language>en-US</language>
     <licenseUrl>https://github.com/rpgmaker/NetJSON/blob/master/LICENSE.text</licenseUrl>

NetJSON/Properties/AssemblyInfo.cs

@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.3")]
-[assembly: AssemblyFileVersion("1.2.1.3")]
+[assembly: AssemblyVersion("1.2.1.4")]
+[assembly: AssemblyFileVersion("1.2.1.4")]
 #if !NET_35
 [assembly: SecurityRules(SecurityRuleSet.Level2, SkipVerificationInFullTrust = true)]
 #endif