Merge remote-tracking branch 'origin/master' into development

cake/UpdateDocs.cake

@@ -242,6 +242,25 @@ Task ("docs-format-docs")
                 .Remove ();
         }
 
+        // remove the duplicate SKDynamicMemoryWStream.CopyTo method with a different return type
+        if (xdoc.Root.Name == "Type" && xdoc.Root.Attribute ("Name")?.Value == "SKDynamicMemoryWStream") {
+            var copyTos = xdoc.Root
+                .Elements ("Members")
+                .Elements ("Member")
+                .Where (e => e.Attribute ("MemberName")?.Value == "CopyTo")
+                .Where (e => e.Elements ("MemberSignature").Any (s => s.Attribute ("Value")?.Value == "M:SkiaSharp.SKDynamicMemoryWStream.CopyTo(SkiaSharp.SKWStream)"));
+            var voidReturn = copyTos.FirstOrDefault (e => e.Element ("ReturnValue")?.Element ("ReturnType")?.Value == "System.Void");
+            var boolReturn = copyTos.FirstOrDefault (e => e.Element ("ReturnValue")?.Element ("ReturnType")?.Value == "System.Boolean");
+            if (voidReturn != null && boolReturn != null) {
+                boolReturn
+                    .Element ("AssemblyInfo")
+                    .Elements ("AssemblyVersion")
+                    .FirstOrDefault ()
+                    .AddBeforeSelf (voidReturn.Element ("AssemblyInfo").Elements ("AssemblyVersion"));
+                voidReturn.Remove ();
+            }
+        }
+
         // count the types without docs
         var typesWithDocs = xdoc.Root
             .Elements ("Docs");

docs/xml/SkiaSharp/SKDynamicMemoryWStream.xml

@@ -43,6 +43,9 @@
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>SkiaSharp</AssemblyName>
+        <AssemblyVersion>1.57.0.0</AssemblyVersion>
+        <AssemblyVersion>1.58.0.0</AssemblyVersion>
+        <AssemblyVersion>1.59.0.0</AssemblyVersion>
         <AssemblyVersion>1.60.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
@@ -58,29 +61,6 @@
         <remarks></remarks>
       </Docs>
     </Member>
-    <Member MemberName="CopyTo">
-      <MemberSignature Language="C#" Value="public void CopyTo (SkiaSharp.SKWStream dst);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void CopyTo(class SkiaSharp.SKWStream dst) cil managed" />
-      <MemberSignature Language="DocId" Value="M:SkiaSharp.SKDynamicMemoryWStream.CopyTo(SkiaSharp.SKWStream)" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>SkiaSharp</AssemblyName>
-        <AssemblyVersion>1.57.0.0</AssemblyVersion>
-        <AssemblyVersion>1.58.0.0</AssemblyVersion>
-        <AssemblyVersion>1.59.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="dst" Type="SkiaSharp.SKWStream" />
-      </Parameters>
-      <Docs>
-        <param name="dst">The stream to copy the data into.</param>
-        <summary>Copies the data from the current stream into another stream.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
     <Member MemberName="CopyTo">
       <MemberSignature Language="C#" Value="public void CopyTo (IntPtr data);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void CopyTo(native int data) cil managed" />