Merge pull request #2152 from joelmartinez/mdoc-preserver

[mono.git] / mcs / class / System / System.Net / FileWebRequest.cs

diff --git a/mcs/class/System/System.Net/FileWebRequest.cs b/mcs/class/System/System.Net/FileWebRequest.cs
index 08c2d00c075b9294fe7e5872e8a5d11ddf619eda..618c09ee145cb5ed92053efb2ab6dcc07b15a423 100644 (file)
--- a/mcs/class/System/System.Net/FileWebRequest.cs
+++ b/mcs/class/System/System.Net/FileWebRequest.cs
@@ -64,9 +64,7 @@ namespace System.Net
                        this.webHeaders = new WebHeaderCollection ();\r
                }\r
                \r
-#if NET_2_0\r
                [Obsolete ("Serialization is obsoleted for this type", false)]\r
-#endif\r
                protected FileWebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) \r
                {\r
                        SerializationInfo info = serializationInfo;\r
@@ -93,11 +91,7 @@ namespace System.Net
                        get { return contentLength; }\r
                        set {\r
                                if (value < 0)\r
-#if NET_2_0\r
                                        throw new ArgumentException ("The Content-Length value must be greater than or equal to zero.", "value");\r
-#else\r
-                                       throw new ArgumentException ("value");\r
-#endif\r
                                contentLength =  value;\r
                        }\r
                }\r
@@ -121,13 +115,8 @@ namespace System.Net
                        get { return this.method; }\r
                        set {\r
                                if (value == null || value.Length == 0)\r
-#if NET_2_0\r
                                        throw new ArgumentException ("Cannot set null or blank "\r
                                                + "methods on request.", "value");\r
-#else\r
-                                       throw new ArgumentException ("Cannot set null or blank "\r
-                                               + "methods on request.");\r
-#endif\r
                                this.method = value;\r
                        }\r
                }\r
@@ -152,18 +141,13 @@ namespace System.Net
                        get { return timeout; }\r
                        set { \r
                                if (value < -1)\r
-#if NET_2_0\r
                                        throw new ArgumentOutOfRangeException ("Timeout can be "\r
                                                + "only set to 'System.Threading.Timeout.Infinite' "\r
                                                + "or a value >= 0.");\r
-#else\r
-                                       throw new ArgumentOutOfRangeException ("value");\r
-#endif\r
                                timeout = value;\r
                        }\r
                }\r
 \r
-#if NET_2_0\r
                public override bool UseDefaultCredentials\r
                {\r
                        get {\r
@@ -173,14 +157,11 @@ namespace System.Net
                                throw new NotSupportedException ();\r
                        }\r
                }\r
-#endif\r
-               \r
                // Methods\r
                \r
                private delegate Stream GetRequestStreamCallback ();\r
                private delegate WebResponse GetResponseCallback ();\r
 \r
-#if NET_2_0\r
                static Exception GetMustImplement ()\r
                {\r
                        return new NotImplementedException ();\r
@@ -194,7 +175,6 @@ namespace System.Net
                {\r
                        throw GetMustImplement ();\r
                }\r
-#endif\r
 \r
                public override IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) \r
                {\r
@@ -305,10 +285,7 @@ namespace System.Net
                        GetObjectData (serializationInfo, streamingContext);\r
                }\r
 \r
-#if NET_2_0\r
-               protected override\r
-#endif\r
-               void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)\r
+               protected override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)\r
                {\r
                        SerializationInfo info = serializationInfo;\r
                        info.AddValue ("headers", webHeaders, typeof (WebHeaderCollection));\r
@@ -319,11 +296,7 @@ namespace System.Net
                        info.AddValue ("contentLength", contentLength);\r
                        info.AddValue ("timeout", timeout);\r
                        info.AddValue ("fileAccess", fileAccess);\r
-#if NET_2_0\r
                        info.AddValue ("preauthenticate", false);\r
-#else\r
-                       info.AddValue ("preauthenticate", preAuthenticate);\r
-#endif\r
                }\r
                \r
                internal void Close ()\r