Skip to content

Commit b0083a8

Browse files
In ISO8601 mode, we dont' want to use the WCF-style \/Date()\/ wrapper syntax.
1 parent 5b7a176 commit b0083a8

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/ServiceStack.Text/Common/DateTimeSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public static string ToWcfJsonDate(DateTime dateTime)
138138
{
139139
if (JsConfig.DateHandler == JsonDateHandler.ISO8601)
140140
{
141-
return EscapedWcfJsonPrefix + dateTime.ToString("o", CultureInfo.InvariantCulture) + EscapedWcfJsonSuffix;
141+
return dateTime.ToString("o", CultureInfo.InvariantCulture);
142142
}
143143

144144
var timestamp = dateTime.ToUnixTimeMs();

tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public void Can_serialize_json_date_iso8601_utc()
191191
var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Utc);
192192
var ssJson = JsonSerializer.SerializeToString(dateTime);
193193

194-
Assert.That(ssJson, Is.EqualTo(@"""\/Date(1994-11-24T12:34:56.0000000Z)\/"""));
194+
Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000Z"""));
195195
JsConfig.Reset();
196196
}
197197

@@ -206,7 +206,7 @@ public void Can_serialize_json_date_iso8601_local()
206206
var offsetSpan = TimeZoneInfo.Local.GetUtcOffset(dateTime);
207207
var offset = offsetSpan.ToTimeOffsetString(true);
208208

209-
Assert.That(ssJson, Is.EqualTo(@"""\/Date(1994-11-24T12:34:56.0000000" + offset + @")\/"""));
209+
Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000" + offset + @""""));
210210
JsConfig.Reset();
211211
}
212212

@@ -218,7 +218,7 @@ public void Can_serialize_json_date_iso8601_unspecified()
218218
var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Unspecified);
219219
var ssJson = JsonSerializer.SerializeToString(dateTime);
220220

221-
Assert.That(ssJson, Is.EqualTo(@"""\/Date(1994-11-24T12:34:56.0000000)\/"""));
221+
Assert.That(ssJson, Is.EqualTo(@"""1994-11-24T12:34:56.0000000"""));
222222
JsConfig.Reset();
223223
}
224224

@@ -227,7 +227,7 @@ public void Can_deserialize_json_date_iso8601_withZOffset_asUtc()
227227
{
228228
JsConfig.DateHandler = JsonDateHandler.ISO8601;
229229

230-
const string json = @"""\/Date(1994-11-24T12:34:56Z)\/""";
230+
const string json = @"""1994-11-24T12:34:56Z""";
231231
var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
232232

233233
var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Utc);
@@ -241,7 +241,7 @@ public void Can_deserialize_json_date_iso8601_withoutOffset_asUnspecified()
241241
{
242242
JsConfig.DateHandler = JsonDateHandler.ISO8601;
243243

244-
const string json = @"""\/Date(1994-11-24T12:34:56)\/""";
244+
const string json = @"""1994-11-24T12:34:56""";
245245
var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
246246

247247
var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Unspecified);
@@ -258,7 +258,7 @@ public void Can_deserialize_json_date_iso8601_withOffset_asLocal()
258258
var dateTime = new DateTime(1994, 11, 24, 12, 34, 56, DateTimeKind.Local);
259259
var offset = TimeZoneInfo.Local.GetUtcOffset(dateTime).ToTimeOffsetString(true);
260260

261-
var json = @"""\/Date(1994-11-24T12:34:56" + offset + @")\/""";
261+
var json = @"""1994-11-24T12:34:56" + offset + @"""";
262262
var fromJson = JsonSerializer.DeserializeFromString<DateTime>(json);
263263

264264

0 commit comments

Comments
 (0)