From 15c732ae7b9483be408cb9a904235dd21d9dd263 Mon Sep 17 00:00:00 2001
From: Stephen Griffin <stephenegriffin@users.noreply.github.com>
Date: Wed, 8 May 2019 09:46:42 -0400
Subject: [PATCH 1/2] Update ns-System.Net.Mail.xml

Lift the warning from SmtpClient to the namespace to make it clearer this is now obsolete.
---
 xml/ns-System.Net.Mail.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xml/ns-System.Net.Mail.xml b/xml/ns-System.Net.Mail.xml
index ce1ec720831..57c0d47ce2d 100644
--- a/xml/ns-System.Net.Mail.xml
+++ b/xml/ns-System.Net.Mail.xml
@@ -1,4 +1,9 @@
 <Namespace Name="System.Net.Mail">
+  <Attributes>
+    <Attribute FrameworkAlternate="xamarinandroid-7.1;xamarinios-10.8;xamarinmac-3.0">
+      <AttributeName>System.Obsolete("SmtpClient and its network of types are poorly designed, we strongly recommend you use https://github.com/jstedfast/MailKit and https://github.com/jstedfast/MimeKit instead")</AttributeName>
+    </Attribute>
+  </Attributes>
   <Docs>
     <summary>The <see cref="N:System.Net.Mail" /> namespace contains classes used to send electronic mail to a Simple Mail Transfer Protocol (SMTP) server for delivery.</summary>
     <remarks>
@@ -6,7 +11,10 @@
   
 ## Remarks  
  The <xref:System.Net.Mail.MailMessage> class represents the content of a mail message. The <xref:System.Net.Mail.SmtpClient> class transmits email to the SMTP host that you designate for mail delivery. You can create mail attachments using the <xref:System.Net.Mail.Attachment> class.  
-  
+
+  [!IMPORTANT] 
+  We don't recommend that you use the `SmtpClient` class for new development. For more information, see [SmtpClient shouldn't be used](https://github.com/dotnet/platform-compat/blob/master/docs/DE0005.md) on GitHub.
+
  ]]></format>
     </remarks>
     <altmember cref="N:System.Net" />
@@ -20,4 +28,4 @@
     <related type="Article" href="~/docs/framework/network-programming/network-tracing.md">Network Tracing in the .NET Framework</related>
     <related type="Article" href="~/docs/framework/network-programming/security-in-network-programming.md">Security in Network Programming</related>
   </Docs>
-</Namespace>
\ No newline at end of file
+</Namespace>

From 635499d80e6b718763c0c5acd0499e3efcd66d81 Mon Sep 17 00:00:00 2001
From: Ron Petrusha <ronpet@microsoft.com>
Date: Wed, 22 May 2019 15:42:27 -0700
Subject: [PATCH 2/2] Update ns-System.Net.Mail.xml

---
 xml/ns-System.Net.Mail.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/xml/ns-System.Net.Mail.xml b/xml/ns-System.Net.Mail.xml
index 57c0d47ce2d..6167b79a25b 100644
--- a/xml/ns-System.Net.Mail.xml
+++ b/xml/ns-System.Net.Mail.xml
@@ -1,19 +1,11 @@
 <Namespace Name="System.Net.Mail">
-  <Attributes>
-    <Attribute FrameworkAlternate="xamarinandroid-7.1;xamarinios-10.8;xamarinmac-3.0">
-      <AttributeName>System.Obsolete("SmtpClient and its network of types are poorly designed, we strongly recommend you use https://github.com/jstedfast/MailKit and https://github.com/jstedfast/MimeKit instead")</AttributeName>
-    </Attribute>
-  </Attributes>
   <Docs>
     <summary>The <see cref="N:System.Net.Mail" /> namespace contains classes used to send electronic mail to a Simple Mail Transfer Protocol (SMTP) server for delivery.</summary>
     <remarks>
       <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
- The <xref:System.Net.Mail.MailMessage> class represents the content of a mail message. The <xref:System.Net.Mail.SmtpClient> class transmits email to the SMTP host that you designate for mail delivery. You can create mail attachments using the <xref:System.Net.Mail.Attachment> class.  
-
-  [!IMPORTANT] 
-  We don't recommend that you use the `SmtpClient` class for new development. For more information, see [SmtpClient shouldn't be used](https://github.com/dotnet/platform-compat/blob/master/docs/DE0005.md) on GitHub.
+The <xref:System.Net.Mail.MailMessage> class represents the content of a mail message. You can create mail attachments using the <xref:System.Net.Mail.Attachment> class.  
 
  ]]></format>
     </remarks>