mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 19:10:23 -10:00
fixing DateTime serialization
svn path=/trunk/mcs/; revision=82988
This commit is contained in:
1 parent
f36eca4e65
commit
3baf413bb9
3 files changed
+38
-8
No files matched your search
+6
-6
@@ -65,8 +65,8 @@ namespace Newtonsoft.Json
|
||||
Null = "null";
|
||||
Undefined = "undefined";
|
||||
|
||||
InitialJavaScriptDateTicks = (new DateTime(1970, 1, 1)).Ticks;
|
||||
MinimumJavaScriptDate = new DateTime(100, 1, 1);
|
||||
InitialJavaScriptDateTicks = new DateTime (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).Ticks;
|
||||
MinimumJavaScriptDate = new DateTime (100, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -78,11 +78,13 @@ namespace Newtonsoft.Json
|
||||
{
|
||||
long javaScriptTicks = ConvertDateTimeToJavaScriptTicks(value);
|
||||
|
||||
return "new Date(" + javaScriptTicks + ")";
|
||||
return @"""\/Date(" + javaScriptTicks + @")\/""";
|
||||
}
|
||||
|
||||
internal static long ConvertDateTimeToJavaScriptTicks(DateTime dateTime)
|
||||
{
|
||||
dateTime = dateTime.ToUniversalTime ();
|
||||
|
||||
if (dateTime < MinimumJavaScriptDate)
|
||||
dateTime = MinimumJavaScriptDate;
|
||||
|
||||
@@ -93,9 +95,7 @@ namespace Newtonsoft.Json
|
||||
|
||||
internal static DateTime ConvertJavaScriptTicksToDateTime(long javaScriptTicks)
|
||||
{
|
||||
DateTime dateTime = new DateTime((javaScriptTicks * 10000) + InitialJavaScriptDateTicks);
|
||||
|
||||
return dateTime;
|
||||
return new DateTime((javaScriptTicks * 10000) + InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in new issue
Block a user