Merge branch 'master' into queryable-value-expression-constructor

Author: grokys

Octokit.GraphQL.Core.Generation.UnitTests/EntityGenerationTests.cs

@@ -1636,7 +1636,7 @@ public void Generates_Doc_Comments_For_Property()
         public void Generates_Doc_Comments_For_Property_With_XmlCharacters()
         {
             var expected = FormatMemberTemplate(@"/// <summary>
-        /// Testing if doc comments are generated &lt;http://localhost&gt;.
+        /// Testing if doc comments &amp; generated &lt;http://localhost&gt;.
         /// </summary>
         public Other Foo => this.CreateProperty(x => x.Foo, Test.Other.Create);");
 
@@ -1649,7 +1649,7 @@ public void Generates_Doc_Comments_For_Property_With_XmlCharacters()
                     new FieldModel
                     {
                         Name = "Foo",
-                        Description = "Testing if doc comments are generated <http://localhost>.",
+                        Description = "Testing if doc comments & generated <http://localhost>.",
                         Type = TypeModel.Object("Other")
                     },
                 }

Octokit.GraphQL.Core.Generation/DocCommentGenerator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using System.Xml;
 
 namespace Octokit.GraphQL.Core.Generation
 {
@@ -20,7 +21,7 @@ public static void GenerateSummary(string summary, int indentation, StringBuilde
 
         private static void GenerateCommentBlock(string text, string indent, StringBuilder builder)
         {
-            text = text.Replace("<", "&lt;").Replace(">", "&gt;");
+            text = text.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;");
 
             foreach (var line in text.Split('\r', '\n'))
             {