Improve NLog XSD Schema with better handling of typed Layout

snakefoot · snakefoot · commit 9a4ffba6e618 · 2025-07-17T21:12:43.000+02:00
diff --git a/tools/DumpApiXml/DocFileBuilder.cs b/tools/DumpApiXml/DocFileBuilder.cs
@@ -18,6 +18,7 @@ public class DocFileBuilder
             { typeof(bool).FullName, "Boolean" },
             { typeof(char).FullName, "Char" },
             { typeof(byte).FullName, "Byte" },
+            { typeof(short).FullName, "Integer" },
             { typeof(CultureInfo).FullName, "Culture" },
             { typeof(Encoding).FullName, "Encoding" },
             { "NLog.Layouts.Layout", "Layout" },
@@ -118,7 +119,6 @@ private string FixWhitespace(string p)
         private static string GetTypeName(Type type)
         {
             string simpleName;
-
             type = GetUnderlyingType(type);
 
             if (simpleTypeNames.TryGetValue(type.FullName, out simpleName))
@@ -131,6 +131,11 @@ private static string GetTypeName(Type type)
 
         private static Type GetUnderlyingType(Type type)
         {
+            if (type.IsGenericType && type.Name.StartsWith("Layout"))
+            {
+                type = type.GetGenericArguments()[0];
+            }
+
             if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
             {
                 type = type.GetGenericArguments()[0];
@@ -479,6 +484,34 @@ private static bool TryGetPropertyDefaultValue(object configInstance, PropertyIn
                     return true;
                 }
 
+                var underlyingType = GetUnderlyingType(propInfo.PropertyType);
+                if (propertyValue != null && underlyingType != null && !ReferenceEquals(underlyingType, propInfo.PropertyType) && !underlyingType.Equals(propertyValue?.GetType()))
+                {
+                    try
+                    {
+                        if (underlyingType.IsEnum)
+                        {
+                            var enumStringValue = propertyValue?.ToString();
+                            defaultValue = Enum.Parse(underlyingType, enumStringValue, true).ToString();
+                            return true;
+                        }
+
+                        if (typeof(IConvertible).IsAssignableFrom(underlyingType))
+                        {
+                            var convStringValue = propertyValue?.ToString();
+                            defaultValue = Convert.ChangeType(convStringValue, underlyingType).ToString();
+                            return true;
+                        }
+                    }
+                    catch
+                    {
+                        // Nothing to do
+                    }
+
+                    defaultValue = null;
+                    return false;
+                }
+
                 IConvertible convertibleValue = propertyValue as IConvertible;
                 if (convertibleValue == null && propertyValue != null)
                 {
