2005-11-28 Chris Toshok <toshok@ximian.com>

	* SmtpClient.cs: ignore warning 618 (obsolete) when compiling an
	already obsolete api (in the 2.0 case).

	* MailAttachment.cs: same.

	* MailMessageWrapper.cs: same.

	* MailMessage.cs: same.

svn path=/trunk/mcs/; revision=53586

diff --git a/mcs/class/System.Web/System.Web.Mail/ChangeLog b/mcs/class/System.Web/System.Web.Mail/ChangeLog
index 3558f6187bf40e9e05583526c2884fe36e2d1888..8e59828b4c1a1f8f21bf1cbe669bf32fcdc95433 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Mail/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-28  Chris Toshok  <toshok@ximian.com>
+
+       * SmtpClient.cs: ignore warning 618 (obsolete) when compiling an
+       already obsolete api (in the 2.0 case).
+
+       * MailAttachment.cs: same.
+
+       * MailMessageWrapper.cs: same.
+
+       * MailMessage.cs: same.
+
 2005-09-15  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * MailPriority.cs: Marked obsolete in 2.0 profile. Fixed line endings.

diff --git a/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs b/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
index 809524b6fd37aaf475917129804312bcddd8ef08..3d6cb364baf8cd0ddb6fd90e45462c56e46fa737 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
@@ -34,6 +34,9 @@ using System.Security.Permissions;
 
 namespace System.Web.Mail
 {
+#if NET_2_0
+#pragma warning disable 618
+#endif
        // CAS
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -76,4 +79,7 @@ namespace System.Web.Mail
                        get { return encoding; } 
                }
        }
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
index 144903ba2829309b6b11d3f5edfa321597fc955e..abfe72ebbcf79c618fbc9228d79cb3098d64d3ab 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
@@ -35,6 +35,9 @@ using System.Text;
 
 namespace System.Web.Mail
 {
+#if NET_2_0
+#pragma warning disable 618
+#endif
        // CAS
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -142,4 +145,7 @@ namespace System.Web.Mail
                }
 #endif
        }
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
index d7ab68663da94bfffaf49807513c9f8599f46e7a..159c336def83f19e81fb3a7c7b3ccb6807d4653e 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
@@ -33,6 +33,10 @@ using System.Text;
 
 namespace System.Web.Mail {
 
+#if NET_2_0
+#pragma warning disable 618
+#endif
+
     // wraps a MailMessage to make an easier
     // interface to work with collections of
     // addresses instead of a single string
@@ -248,4 +252,8 @@ namespace System.Web.Mail {
                }
 #endif
     }   
+
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }

diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
index 9c5c7e7d487c6f8bacb684e7d98d8c299eca073d..271423a4cf57ed189ece87cd94b1cc0185da3cba 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
@@ -36,6 +36,9 @@ using System.Net.Sockets;
 using System.Security.Permissions;
 
 namespace System.Web.Mail {
+#if NET_2_0
+#pragma warning disable 618
+#endif
 
     /// represents a conntection to a smtp server
     internal class SmtpClient {
@@ -242,5 +245,7 @@ namespace System.Web.Mail {
        
                
     }
-
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }

diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
index 7e6042c02684d364f0cee28a25178b698eda6ec5..c074f44e2fbff0c931f6271be105560d5c8cfea9 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
@@ -36,6 +36,9 @@ using System.Security.Permissions;
 
 namespace System.Web.Mail
 {
+#if NET_2_0
+#pragma warning disable 618
+#endif
        // CAS
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -119,4 +122,7 @@ namespace System.Web.Mail
                        Send (message);
                }
        }
+#if NET_2_0
+#pragma warning restore 618
+#endif
 }