Removal of NET_1_1 defines and some NET_2_0; Both defines are true these days in...

[mono.git] / mcs / class / System.Web / System.Web.Mail / MailMessage.cs

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
index 144903ba2829309b6b11d3f5edfa321597fc955e..f5f1a2d135350b0fffdb138ab6819e2159b922a7 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
@@ -35,27 +35,27 @@ using System.Text;
 
 namespace System.Web.Mail
 {
+#if !NET_4_0
        // CAS
        [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-#if NET_2_0
-       [Obsolete ("The recommended alternative is System.Net.Mail.MailMessage.")]
 #endif
+       [Obsolete ("The recommended alternative is System.Net.Mail.MailMessage. http://go.microsoft.com/fwlink/?linkid=14202")]
        public class MailMessage
        {
-               private ArrayList attachments;
-               private string bcc;
-               private string body = String.Empty;
-               private Encoding bodyEncoding;
-               private MailFormat bodyFormat;
-               private string cc;              
-               private string from;
-               private ListDictionary headers;
-               private MailPriority priority;
-               private string subject = String.Empty;
-               private string to;
-               private string urlContentBase;
-               private string urlContentLocation;
+               ArrayList attachments;
+               string bcc;
+               string body = String.Empty;
+               Encoding bodyEncoding;
+               MailFormat bodyFormat;
+               string cc;              
+               string from;
+               ListDictionary headers;
+               MailPriority priority;
+               string subject = String.Empty;
+               string to;
+               string urlContentBase;
+               string urlContentLocation;
                
                // Constructor          
                public MailMessage ()
@@ -63,9 +63,7 @@ namespace System.Web.Mail
                        attachments = new ArrayList (8);
                        headers = new ListDictionary ();
                        bodyEncoding = Encoding.Default;
-#if NET_1_1
                        fields = new Hashtable ();
-#endif
                }               
        
                // Properties
@@ -132,14 +130,12 @@ namespace System.Web.Mail
                        set { urlContentLocation = value; }
                }
 
-#if NET_1_1
-               private Hashtable fields;
+               Hashtable fields;
                
                public IDictionary Fields {
                        get {
                                return (IDictionary) fields;
                        }
                }
-#endif
        }
 }