Change default format of Guid to use 'D' when JsConfig.SystemJsonCompatible

mythz · mythz · commit f7e24245ebe1 · 2025-01-31T10:29:44.000+08:00
diff --git a/ServiceStack.Text/src/ServiceStack.Text/Common/JsWriter.cs b/ServiceStack.Text/src/ServiceStack.Text/Common/JsWriter.cs
@@ -104,7 +104,7 @@ internal static bool ShouldUseDefaultToStringMethod(Type type)
                 return true;
         }
 
-        return underlyingType == typeof(Guid);
+        return false;
     }
 
     public static ITypeSerializer GetTypeSerializer<TSerializer>()
diff --git a/ServiceStack.Text/src/ServiceStack.Text/Common/WriteLists.cs b/ServiceStack.Text/src/ServiceStack.Text/Common/WriteLists.cs
@@ -492,7 +492,7 @@ public static WriteObjectDelegate GetWriteFn()
 
         var listInterface = type.GetTypeWithGenericTypeDefinitionOf(typeof(IList<>));
         if (listInterface == null)
-            throw new ArgumentException(string.Format("Type {0} is not of type IList<>", type.FullName));
+            throw new ArgumentException($"Type {type.FullName} is not of type IList<>");
 
         //optimized access for regularly used types
         if (type == typeof(List<string>))
diff --git a/ServiceStack.Text/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/ServiceStack.Text/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -169,15 +169,15 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)
     public void WriteGuid(TextWriter writer, object oValue)
     {
         var formatted = JsConfig.SystemJsonCompatible
-            ? ((Guid)oValue).ToString()
+            ? ((Guid)oValue).ToString("D")
             : ((Guid)oValue).ToString("N");
         WriteRawString(writer, formatted);
     }
 
     public void WriteNullableGuid(TextWriter writer, object oValue)
     {
         if (oValue == null) return;
-        WriteRawString(writer, ((Guid)oValue).ToString("N"));
+        WriteGuid(writer, oValue);
     }
 
     public void WriteBytes(TextWriter writer, object oByteValue)
diff --git a/ServiceStack.Text/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/ServiceStack.Text/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -130,13 +130,16 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)
 
     public void WriteGuid(TextWriter writer, object oValue)
     {
-        writer.Write(((Guid)oValue).ToString("N"));
+        var formatted = JsConfig.SystemJsonCompatible
+            ? ((Guid)oValue).ToString("D")
+            : ((Guid)oValue).ToString("N");
+        writer.Write(formatted);
     }
 
     public void WriteNullableGuid(TextWriter writer, object oValue)
     {
         if (oValue == null) return;
-        writer.Write(((Guid)oValue).ToString("N"));
+        WriteGuid(writer, oValue);
     }
 
     public void WriteBytes(TextWriter writer, object oByteValue)

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ internal static bool ShouldUseDefaultToStringMethod(Type type)`
`104`	`104`	`return true;`
`105`	`105`	`}`
`106`	`106`
`107`		`- return underlyingType == typeof(Guid);`
	`107`	`+ return false;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public static ITypeSerializer GetTypeSerializer<TSerializer>()`
Original file line number	Diff line number	Diff line change
`@@ -169,15 +169,15 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)`
`169`	`169`	`public void WriteGuid(TextWriter writer, object oValue)`
`170`	`170`	`{`
`171`	`171`	`var formatted = JsConfig.SystemJsonCompatible`
`172`		`- ? ((Guid)oValue).ToString()`
	`172`	`+ ? ((Guid)oValue).ToString("D")`
`173`	`173`	`: ((Guid)oValue).ToString("N");`
`174`	`174`	`WriteRawString(writer, formatted);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`public void WriteNullableGuid(TextWriter writer, object oValue)`
`178`	`178`	`{`
`179`	`179`	`if (oValue == null) return;`
`180`		`- WriteRawString(writer, ((Guid)oValue).ToString("N"));`
	`180`	`+ WriteGuid(writer, oValue);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public void WriteBytes(TextWriter writer, object oByteValue)`
Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,16 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)`
`130`	`130`
`131`	`131`	`public void WriteGuid(TextWriter writer, object oValue)`
`132`	`132`	`{`
`133`		`- writer.Write(((Guid)oValue).ToString("N"));`
	`133`	`+ var formatted = JsConfig.SystemJsonCompatible`
	`134`	`+ ? ((Guid)oValue).ToString("D")`
	`135`	`+ : ((Guid)oValue).ToString("N");`
	`136`	`+ writer.Write(formatted);`
`134`	`137`	`}`
`135`	`138`
`136`	`139`	`public void WriteNullableGuid(TextWriter writer, object oValue)`
`137`	`140`	`{`
`138`	`141`	`if (oValue == null) return;`
`139`		`- writer.Write(((Guid)oValue).ToString("N"));`
	`142`	`+ WriteGuid(writer, oValue);`
`140`	`143`	`}`
`141`	`144`
`142`	`145`	`public void WriteBytes(TextWriter writer, object oByteValue)`