fix the bug that dateTime.Kind equals Local and offset does not equal…

… the offset of the system's local time zone when invoke the DateTimeOffset constructor
chinadragon0515 · Aug 22, 2016 · 7acc926 · 7acc926
1 parent e2343a2
commit 7acc926
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Microsoft.Restier.Publishers.OData/Formatter/Serialization/RestierPrimitiveSerializer.cs b/src/Microsoft.Restier.Publishers.OData/Formatter/Serialization/RestierPrimitiveSerializer.cs
@@ -63,7 +63,10 @@ public override ODataPrimitiveValue CreateODataPrimitiveValue(
             // zone when converting the "graph" to a DateTimeOffset.
             if (primitiveType != null && primitiveType.IsDateTimeOffset() && graph is DateTime)
             {
-                graph = new DateTimeOffset((DateTime)graph, TimeSpan.Zero);
+                // If DateTime.Kind equals Local, offset should equal the offset of the system's local time zone
+                graph = new DateTimeOffset((DateTime)graph,
+                    ((DateTime)graph).Kind == DateTimeKind.Local ?
+                    TimeZoneInfo.Local.GetUtcOffset((DateTime)graph) : TimeSpan.Zero);
             }
 
             return base.CreateODataPrimitiveValue(graph, primitiveType, writeContext);

diff --git a/src/Microsoft.Restier.Publishers.OData/RestierPayloadValueConverter.cs b/src/Microsoft.Restier.Publishers.OData/RestierPayloadValueConverter.cs
@@ -35,7 +35,9 @@ public override object ConvertToPayloadValue(object value, IEdmTypeReference edm
                     }
 
                     // System.DateTime[SqlType = DateTime or DateTime2] => Edm.DateTimeOffset
-                    return new DateTimeOffset(dateTimeValue, TimeSpan.Zero);
+                    // If DateTime.Kind equals Local, offset should equal the offset of the system's local time zone
+                    return new DateTimeOffset(dateTimeValue, dateTimeValue.Kind == DateTimeKind.Local ?
+                        TimeZoneInfo.Local.GetUtcOffset(dateTimeValue) : TimeSpan.Zero);
                 }
 
                 // System.TimeSpan is shared by *Edm.TimeOfDay and Edm.Duration: