Correctly escape XML docs, closes #946

RicoSuter · Apr 11, 2019 · 4aa91ed · 4aa91ed
1 parent 4643d38
commit 4aa91ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs b/src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs
@@ -177,7 +177,7 @@ internal static class LiquidFilters
         {
             public static string Csharpdocs(string input, int tabCount)
             {
-                return ConversionUtilities.ConvertCSharpDocBreaks(input, tabCount);
+                return ConversionUtilities.ConvertCSharpDocs(input, tabCount);
             }
 
             public static string Tab(Context context, string input, int tabCount)

diff --git a/src/NJsonSchema/ConversionUtilities.cs b/src/NJsonSchema/ConversionUtilities.cs
@@ -8,6 +8,7 @@
 
 using System.Linq;
 using System.Text;
+using System.Xml.Linq;
 
 namespace NJsonSchema
 {
@@ -151,9 +152,14 @@ public static string Tab(string input, int tabCount)
         /// <param name="input">The input.</param>
         /// <param name="tabCount">The tab count.</param>
         /// <returns>The output.</returns>
-        public static string ConvertCSharpDocBreaks(string input, int tabCount)
+        public static string ConvertCSharpDocs(string input, int tabCount)
         {
-            return input?.Replace("\r", string.Empty).Replace("\n", "\n" + string.Join("", Enumerable.Repeat("    ", tabCount)) + "/// ") ?? string.Empty;
+            input = input?
+                .Replace("\r", string.Empty)
+                .Replace("\n", "\n" + string.Join("", Enumerable.Repeat("    ", tabCount)) + "/// ")
+                ?? string.Empty;
+
+            return new XText(input).ToString();
         }
 
         private static string ConvertDashesToCamelCase(string input)