From 88c23d1753268b060e3a621b817c48c57f948271 Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Thu, 30 Jul 2020 23:15:30 +0100
Subject: [PATCH 1/2] Recommend not to use System.Drawing

---
 includes/drawing.md                 | 2 ++
 xml/ns-System.Drawing.Drawing2D.xml | 3 +++
 xml/ns-System.Drawing.Imaging.xml   | 3 +++
 xml/ns-System.Drawing.xml           | 3 +++
 4 files changed, 11 insertions(+)
 create mode 100644 includes/drawing.md

diff --git a/includes/drawing.md b/includes/drawing.md
new file mode 100644
index 00000000000..d22e48b1480
--- /dev/null
+++ b/includes/drawing.md
@@ -0,0 +1,2 @@
+> [!WARNING]
+> We don't recommend that you use the `System.Drawing` namespace for new development as it is  not supported for use within a Windows or ASP.NET service and it is not cross-platform. Use  [ImageSharp](https://github.com/SixLabors/ImageSharp) or other libraries instead.
diff --git a/xml/ns-System.Drawing.Drawing2D.xml b/xml/ns-System.Drawing.Drawing2D.xml
index 24678dbcf1a..7f3b0b8d956 100644
--- a/xml/ns-System.Drawing.Drawing2D.xml
+++ b/xml/ns-System.Drawing.Drawing2D.xml
@@ -5,6 +5,9 @@
       <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
+
+[!INCLUDE[drawing](~/includes/drawing.md)]
+
  The following table lists some of the important classes and enumerations in the <xref:System.Drawing.Drawing2D> namespace, grouped into categories.  
   
 |Class category|Details|  
diff --git a/xml/ns-System.Drawing.Imaging.xml b/xml/ns-System.Drawing.Imaging.xml
index 52615021f75..6293f3bbda3 100644
--- a/xml/ns-System.Drawing.Imaging.xml
+++ b/xml/ns-System.Drawing.Imaging.xml
@@ -5,6 +5,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
+
+[!INCLUDE[drawing](~/includes/drawing.md)]
+
  The <xref:System.Drawing.Imaging.Metafile> class provides methods for recording and saving metafiles. The <xref:System.Drawing.Imaging.Encoder> class enables users to extend GDI+ to support any image format. The <xref:System.Drawing.Imaging.PropertyItem> class provides methods for storing and retrieving metadata in image files.
 
 > [!CAUTION]
diff --git a/xml/ns-System.Drawing.xml b/xml/ns-System.Drawing.xml
index 540cadf4f0a..91a01e0b819 100644
--- a/xml/ns-System.Drawing.xml
+++ b/xml/ns-System.Drawing.xml
@@ -5,6 +5,9 @@
       <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
+
+[!INCLUDE[drawing](~/includes/drawing.md)]
+
  The <xref:System.Drawing.Graphics> class provides methods for drawing to the display device. Classes such as <xref:System.Drawing.Rectangle> and <xref:System.Drawing.Point> encapsulate GDI+ primitives. The <xref:System.Drawing.Pen> class is used to draw lines and curves, while classes derived from the abstract class <xref:System.Drawing.Brush> are used to fill the interiors of shapes.  
   
 > [!CAUTION]

From 57c4c174f693110237aad2d1507d4739ae70d2a6 Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Fri, 31 Jul 2020 09:44:18 +0100
Subject: [PATCH 2/2] Update includes/drawing.md

Co-authored-by: Rich Lander <rlander@microsoft.com>
---
 includes/drawing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/drawing.md b/includes/drawing.md
index d22e48b1480..4b6006a7a65 100644
--- a/includes/drawing.md
+++ b/includes/drawing.md
@@ -1,2 +1,2 @@
 > [!WARNING]
-> We don't recommend that you use the `System.Drawing` namespace for new development as it is  not supported for use within a Windows or ASP.NET service and it is not cross-platform. Use  [ImageSharp](https://github.com/SixLabors/ImageSharp) or other libraries instead.
+> The `System.Drawing` namespace is not recommended for new development, due to not being supported within a Windows or ASP.NET service and it is not cross-platform. [ImageSharp](https://github.com/SixLabors/ImageSharp) and [SkiaSharp](https://github.com/mono/SkiaSharp) are recommended as alternatives.