From 355a27b73dd51d786c42be36f03852383c001360 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Fri, 19 Mar 2010 19:01:31 +0000 Subject: [PATCH] In System.Timers: 2010-03-19 Sebastien Pouliot * Timer.cs: Removed old NET_2_0 defines and added some new MOONLIGHT defines (needed for the client stack) In System.Net: 2010-03-19 Sebastien Pouliot * AuthenticationManager.cs: Internal type for Moonlight. Add BasicClient, DigestClient, NtlmClient for NET_2_1 since this applies to both monotouch and moonlight (client stack). Removed unneeded NET_2_0 defines * CookieContainer.cs: For Moonlight it needs to be internal in System.dll and public in System.Net.dll. Removed unneeded NET_2_0 defines * HttpContinueDelegate.cs: Internal type for Moonlight. * HttpRequestCreator.cs: Remove a MOONLIGHT define * HttpStatusCode.cs: For Moonlight it needs to be internal in System.dll and public in System.Net.dll * HttpWebRequest.cs: Internal type for Moonlight. Change S.Config to NET_2_1 defines (applies to both monotouch and moonlight). Removed unneeded NET_2_0 and NET_1_1 defines * HttpWebResponse.cs: Internal type for Moonlight. Removed unneeded NET_2_0 defines * IAuthenticationModule.cs: Internal type for Moonlight. * ICertificatePolicy.cs: Internal type for Moonlight. * ICredentialPolicy.cs: Internal type for Moonlight. Removed unneeded NET_2_0 defines * IWebRequestCreate.cs: For Moonlight it needs to be internal in System.dll and public in System.Net.dll * ServicePoint.cs: Internal type for Moonlight. Change S.Config to NET_2_1 defines (applies to both monotouch and moonlight) * ServicePointManager.cs: Remove a MOONLIGHT define * WebException.cs: For Moonlight it needs to be internal in System.dll and public in System.Net.dll. Removed unneeded NET_2_0 defines * WebHeaderCollection.cs: Internal type for Moonlight. Removed unneeded NET_2_0 defines * WebRequest.cs: Internal type for Moonlight. Change S.Config to NET_2_1 defines (applies to both monotouch and moonlight) * WebResponse.cs: Internal type for Moonlight. Removed unneeded NET_2_0 defines In System.Net.Sockets: 2010-03-19 Sebastien Pouliot * Socket.cs: Remove some NET_2_0 defines (using) and add a few MOONLIGHT defines needed to reuse Socket in the client http stack * Socket_2_1.cs: Remove some MOONLIGHT defines * SocketAsyncEventArgs.cs: For Moonlight check policy if outside System.dll (the client stack use sockets with it's own web xdomain policy) In System: 2010-03-19 Sebastien Pouliot * Uri.cs: Remove some MOONLIGHT defines In .: 2010-03-19 Sebastien Pouliot * moonlight_*_System.dll.sources: Bring extra types so we can build a full, managed, internal HTTP stack to be reused for SL3+ * Makefile: Add a INSIDE_SYSTEM define when compiling System.dll to makes it possible to rebuild the same types in System.Net.dll svn path=/trunk/mcs/; revision=153916 --- mcs/class/System/ChangeLog | 7 + mcs/class/System/Makefile | 3 + mcs/class/System/System.Net.Sockets/ChangeLog | 9 + mcs/class/System/System.Net.Sockets/Socket.cs | 9 +- .../SocketAsyncEventArgs.cs | 4 +- .../System/System.Net.Sockets/Socket_2_1.cs | 7 +- .../System.Net/AuthenticationManager.cs | 19 +- mcs/class/System/System.Net/ChangeLog | 37 ++++ .../System/System.Net/CookieContainer.cs | 22 +- .../System/System.Net/HttpContinueDelegate.cs | 7 +- .../System/System.Net/HttpRequestCreator.cs | 4 - mcs/class/System/System.Net/HttpStatusCode.cs | 4 + mcs/class/System/System.Net/HttpWebRequest.cs | 70 +------ .../System/System.Net/HttpWebResponse.cs | 53 +---- .../System.Net/IAuthenticationModule.cs | 7 +- .../System/System.Net/ICertificatePolicy.cs | 6 +- .../System/System.Net/ICredentialPolicy.cs | 8 +- .../System/System.Net/IWebRequestCreate.cs | 6 +- mcs/class/System/System.Net/ServicePoint.cs | 2 +- .../System/System.Net/ServicePointManager.cs | 13 +- mcs/class/System/System.Net/WebException.cs | 9 +- .../System/System.Net/WebHeaderCollection.cs | 18 +- mcs/class/System/System.Net/WebRequest.cs | 19 +- mcs/class/System/System.Net/WebResponse.cs | 11 +- mcs/class/System/System.Timers/ChangeLog | 5 + mcs/class/System/System.Timers/Timer.cs | 21 +- mcs/class/System/System/ChangeLog | 4 + mcs/class/System/System/Uri.cs | 7 +- .../moonlight_bootstrap_System.dll.sources | 2 + .../System/moonlight_raw_System.dll.sources | 193 +++++++++++++++++- 30 files changed, 378 insertions(+), 208 deletions(-) diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog index e58101cd20e..91ab8989729 100644 --- a/mcs/class/System/ChangeLog +++ b/mcs/class/System/ChangeLog @@ -1,3 +1,10 @@ +2010-03-19 Sebastien Pouliot + + * moonlight_*_System.dll.sources: Bring extra types so we can + build a full, managed, internal HTTP stack to be reused for SL3+ + * Makefile: Add a INSIDE_SYSTEM define when compiling System.dll + to makes it possible to rebuild the same types in System.Net.dll + 2010-03-16 Jb Evain * net_2_1_*.dll.sources: rename to moonlight_*.dll.sources. diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 1a408b07255..0e2a75541b4 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -29,6 +29,9 @@ TEST_MCS_FLAGS += -r:System.Configuration PROFILE_2_OR_4 := $(filter net_2_0 net_4_0, $(PROFILE)) NOT_SL := $(filter net_2_0 net_4_0 monotouch, $(PROFILE)) endif +ifeq (2.1, $(FRAMEWORK_VERSION)) +LIB_MCS_FLAGS += -d:INSIDE_SYSTEM +endif EXTRA_DISTFILES = \ System.Text.RegularExpressions/notes.txt \ diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog index 8eb1b976f96..112a692a92b 100644 --- a/mcs/class/System/System.Net.Sockets/ChangeLog +++ b/mcs/class/System/System.Net.Sockets/ChangeLog @@ -1,3 +1,12 @@ +2010-03-19 Sebastien Pouliot + + * Socket.cs: Remove some NET_2_0 defines (using) and add a few + MOONLIGHT defines needed to reuse Socket in the client http stack + * Socket_2_1.cs: Remove some MOONLIGHT defines + * SocketAsyncEventArgs.cs: For Moonlight check policy if outside + System.dll (the client stack use sockets with it's own web + xdomain policy) + 2010-03-16 Jb Evain * Socket_2_1.cs, SocketAsyncEventArgs.cs: use MOONLIGHT symbol to diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs index 0d5d30baa3f..ac1f8e2c881 100644 --- a/mcs/class/System/System.Net.Sockets/Socket.cs +++ b/mcs/class/System/System.Net.Sockets/Socket.cs @@ -36,6 +36,7 @@ using System; using System.Net; using System.Collections; +using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; @@ -43,11 +44,9 @@ using System.Reflection; using System.IO; using System.Net.Configuration; using System.Text; - -#if NET_2_0 -using System.Collections.Generic; -using System.Net.NetworkInformation; using System.Timers; +#if !MOONLIGHT +using System.Net.NetworkInformation; #endif namespace System.Net.Sockets @@ -1793,7 +1792,7 @@ namespace System.Net.Sockets seed_endpoint = local_end; } -#if NET_2_0 +#if !MOONLIGHT public bool ConnectAsync (SocketAsyncEventArgs e) { // NO check is made whether e != null in MS.NET (NRE is thrown in such case) diff --git a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs index efd27f56ff6..bf427c83a52 100644 --- a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs +++ b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; using System.Reflection; using System.Security; using System.Threading; -#if MOONLIGHT +#if MOONLIGHT && !INSIDE_SYSTEM using System.Net.Policy; #endif @@ -245,7 +245,7 @@ namespace System.Net.Sockets { curSocket.Connected = false; SocketError error = SocketError.Success; -#if MOONLIGHT +#if MOONLIGHT && !INSIDE_SYSTEM // if we're not downloading a socket policy then check the policy if (!PolicyRestricted) { error = SocketError.AccessDenied; diff --git a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs b/mcs/class/System/System.Net.Sockets/Socket_2_1.cs index 2d9f1f85850..af54044c3d5 100644 --- a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs +++ b/mcs/class/System/System.Net.Sockets/Socket_2_1.cs @@ -227,7 +227,7 @@ namespace System.Net.Sockets { bool block, out int error); #endif -#if !MOONLIGHT + public bool Blocking { get { return(blocking); @@ -246,7 +246,7 @@ namespace System.Net.Sockets { blocking=value; } } -#endif + public bool Connected { get { return connected; } internal set { connected = value; } @@ -565,7 +565,6 @@ namespace System.Net.Sockets { [MethodImplAttribute(MethodImplOptions.InternalCall)] extern static bool Poll_internal (IntPtr socket, SelectMode mode, int timeout, out int error); -#if !MOONLIGHT /* This overload is needed as the async Connect method * also needs to check the socket error status, but * getsockopt(..., SO_ERROR) clears the error. @@ -600,7 +599,7 @@ namespace System.Net.Sockets { return result; } -#endif + [MethodImplAttribute(MethodImplOptions.InternalCall)] private extern static int Receive_internal(IntPtr sock, byte[] buffer, diff --git a/mcs/class/System/System.Net/AuthenticationManager.cs b/mcs/class/System/System.Net/AuthenticationManager.cs index 798448f1e62..876418bbc6f 100644 --- a/mcs/class/System/System.Net/AuthenticationManager.cs +++ b/mcs/class/System/System.Net/AuthenticationManager.cs @@ -30,16 +30,17 @@ // using System.Collections; +using System.Collections.Specialized; using System.Configuration; -#if NET_2_0 using System.Net.Configuration; -using System.Collections.Specialized; -#endif namespace System.Net { - public class AuthenticationManager - { +#if MOONLIGHT + internal class AuthenticationManager { +#else + public class AuthenticationManager { +#endif static ArrayList modules; static object locker = new object (); @@ -54,12 +55,11 @@ namespace System.Net return; modules = new ArrayList (); -#if MONOTOUCH +#if NET_2_1 modules.Add (new BasicClient ()); modules.Add (new DigestClient ()); modules.Add (new NtlmClient ()); -#else -#if NET_2_0 && CONFIGURATION_DEP +#elif NET_2_0 && CONFIGURATION_DEP object cfg = ConfigurationManager.GetSection ("system.net/authenticationModules"); AuthenticationModulesSection s = cfg as AuthenticationModulesSection; if (s != null) { @@ -74,12 +74,10 @@ namespace System.Net } #else ConfigurationSettings.GetConfig ("system.net/authenticationModules"); -#endif #endif } } -#if NET_2_0 static ICredentialPolicy credential_policy = null; public static ICredentialPolicy CredentialPolicy @@ -104,7 +102,6 @@ namespace System.Net throw GetMustImplement (); } } -#endif public static IEnumerator RegisteredModules { get { diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog index 9300632aefd..5b7ceb13e93 100644 --- a/mcs/class/System/System.Net/ChangeLog +++ b/mcs/class/System/System.Net/ChangeLog @@ -1,3 +1,40 @@ +2010-03-19 Sebastien Pouliot + + * AuthenticationManager.cs: Internal type for Moonlight. + Add BasicClient, DigestClient, NtlmClient for NET_2_1 since + this applies to both monotouch and moonlight (client stack). + Removed unneeded NET_2_0 defines + * CookieContainer.cs: For Moonlight it needs to be internal in + System.dll and public in System.Net.dll. Removed unneeded NET_2_0 + defines + * HttpContinueDelegate.cs: Internal type for Moonlight. + * HttpRequestCreator.cs: Remove a MOONLIGHT define + * HttpStatusCode.cs: For Moonlight it needs to be internal in + System.dll and public in System.Net.dll + * HttpWebRequest.cs: Internal type for Moonlight. Change S.Config + to NET_2_1 defines (applies to both monotouch and moonlight). + Removed unneeded NET_2_0 and NET_1_1 defines + * HttpWebResponse.cs: Internal type for Moonlight. Removed + unneeded NET_2_0 defines + * IAuthenticationModule.cs: Internal type for Moonlight. + * ICertificatePolicy.cs: Internal type for Moonlight. + * ICredentialPolicy.cs: Internal type for Moonlight. Removed + unneeded NET_2_0 defines + * IWebRequestCreate.cs: For Moonlight it needs to be internal in + System.dll and public in System.Net.dll + * ServicePoint.cs: Internal type for Moonlight. Change S.Config + to NET_2_1 defines (applies to both monotouch and moonlight) + * ServicePointManager.cs: Remove a MOONLIGHT define + * WebException.cs: For Moonlight it needs to be internal in + System.dll and public in System.Net.dll. Removed unneeded NET_2_0 + defines + * WebHeaderCollection.cs: Internal type for Moonlight. Removed + unneeded NET_2_0 defines + * WebRequest.cs: Internal type for Moonlight. Change S.Config + to NET_2_1 defines (applies to both monotouch and moonlight) + * WebResponse.cs: Internal type for Moonlight. Removed unneeded + NET_2_0 defines + 2010-03-18 Gonzalo Paniagua Javier * FtpWebResponse.cs: diff --git a/mcs/class/System/System.Net/CookieContainer.cs b/mcs/class/System/System.Net/CookieContainer.cs index 0068d5fca23..84e507de60f 100644 --- a/mcs/class/System/System.Net/CookieContainer.cs +++ b/mcs/class/System/System.Net/CookieContainer.cs @@ -41,8 +41,12 @@ using System.Text.RegularExpressions; namespace System.Net { [Serializable] -#if NET_2_1 +#if MOONLIGHT + #if INSIDE_SYSTEM + internal sealed class CookieContainer { + #else public sealed class CookieContainer { + #endif #else public class CookieContainer { #endif @@ -63,11 +67,7 @@ namespace System.Net public CookieContainer (int capacity) { if (capacity <= 0) -#if NET_2_0 throw new ArgumentException ("Must be greater than zero", "Capacity"); -#else - throw new ArgumentException ("Capacity"); -#endif this.capacity = capacity; } @@ -76,21 +76,13 @@ namespace System.Net : this (capacity) { if (perDomainCapacity != Int32.MaxValue && (perDomainCapacity <= 0 || perDomainCapacity > capacity)) -#if NET_2_0 throw new ArgumentOutOfRangeException ("perDomainCapacity", string.Format ("PerDomainCapacity must be " + "greater than {0} and less than {1}.", 0, capacity)); -#else - throw new ArgumentException ("PerDomainCapacity"); -#endif if (maxCookieSize <= 0) -#if NET_2_0 throw new ArgumentException ("Must be greater than zero", "MaxCookieSize"); -#else - throw new ArgumentException ("MaxCookieSize"); -#endif this.perDomainCapacity = perDomainCapacity; this.maxCookieSize = maxCookieSize; @@ -138,11 +130,7 @@ namespace System.Net throw new ArgumentNullException ("cookie"); if (cookie.Domain.Length == 0) -#if NET_2_0 throw new ArgumentException ("Cookie domain not set.", "cookie.Domain"); -#else - throw new ArgumentException ("cookie.Domain"); -#endif if (cookie.Value.Length > maxCookieSize) throw new CookieException ("value is larger than MaxCookieSize."); diff --git a/mcs/class/System/System.Net/HttpContinueDelegate.cs b/mcs/class/System/System.Net/HttpContinueDelegate.cs index d71b746e630..21bfee19119 100644 --- a/mcs/class/System/System.Net/HttpContinueDelegate.cs +++ b/mcs/class/System/System.Net/HttpContinueDelegate.cs @@ -28,7 +28,12 @@ namespace System.Net { - public delegate void HttpContinueDelegate ( +#if MOONLIGHT + internal +#else + public +#endif + delegate void HttpContinueDelegate ( int StatusCode, WebHeaderCollection httpHeaders); } diff --git a/mcs/class/System/System.Net/HttpRequestCreator.cs b/mcs/class/System/System.Net/HttpRequestCreator.cs index ae9462b097c..cabc9db1f29 100644 --- a/mcs/class/System/System.Net/HttpRequestCreator.cs +++ b/mcs/class/System/System.Net/HttpRequestCreator.cs @@ -38,11 +38,7 @@ namespace System.Net public WebRequest Create (Uri uri) { -#if MOONLIGHT - throw new NotImplementedException (); -#else return new HttpWebRequest (uri); -#endif } } } diff --git a/mcs/class/System/System.Net/HttpStatusCode.cs b/mcs/class/System/System.Net/HttpStatusCode.cs index f6b72e03253..123b7c37a25 100644 --- a/mcs/class/System/System.Net/HttpStatusCode.cs +++ b/mcs/class/System/System.Net/HttpStatusCode.cs @@ -32,7 +32,11 @@ namespace System.Net { +#if MOONLIGHT && INSIDE_SYSTEM + internal enum HttpStatusCode { +#else public enum HttpStatusCode { +#endif Continue = 100, SwitchingProtocols = 101, OK = 200, diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs index f35109c7000..2be45f15b1f 100644 --- a/mcs/class/System/System.Net/HttpWebRequest.cs +++ b/mcs/class/System/System.Net/HttpWebRequest.cs @@ -35,6 +35,7 @@ using System; using System.Collections; using System.Configuration; using System.IO; +using System.Net.Cache; using System.Net.Sockets; using System.Runtime.Remoting.Messaging; using System.Runtime.Serialization; @@ -42,15 +43,14 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading; -#if NET_2_0 -using System.Net.Cache; -#endif - namespace System.Net { +#if MOONLIGHT + internal class HttpWebRequest : WebRequest, ISerializable { +#else [Serializable] - public class HttpWebRequest : WebRequest, ISerializable - { + public class HttpWebRequest : WebRequest, ISerializable { +#endif Uri requestUri; Uri actualUri; bool hostChanged; @@ -99,10 +99,7 @@ namespace System.Net bool is_ntlm_auth; bool finished_reading; internal WebConnection WebConnection; -#if NET_2_0 DecompressionMethods auto_decomp; -#endif -#if NET_1_1 int maxResponseHeadersLength; static int defaultMaxResponseHeadersLength; int readWriteTimeout = 300000; // ms @@ -111,7 +108,7 @@ namespace System.Net static HttpWebRequest () { defaultMaxResponseHeadersLength = 64 * 1024; -#if !MONOTOUCH +#if !NET_2_1 NetConfig config = ConfigurationSettings.GetConfig ("system.net/settings") as NetConfig; if (config != null) { int x = config.MaxResponseHeadersLength; @@ -122,7 +119,6 @@ namespace System.Net } #endif } -#endif #if NET_2_1 public @@ -136,9 +132,7 @@ namespace System.Net this.proxy = GlobalProxySelection.Select; } -#if NET_2_0 [Obsolete ("Serialization is obsoleted for this type", false)] -#endif protected HttpWebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) { SerializationInfo info = serializationInfo; @@ -192,7 +186,6 @@ namespace System.Net set { allowBuffering = value; } } -#if NET_2_0 static Exception GetMustImplement () { return new NotImplementedException (); @@ -208,7 +201,6 @@ namespace System.Net auto_decomp = value; } } -#endif internal bool InternalAllowBuffering { get { @@ -225,12 +217,10 @@ namespace System.Net return certificates; } -#if NET_2_0 [MonoTODO] set { throw GetMustImplement (); } -#endif } public string Connection { @@ -302,7 +292,6 @@ namespace System.Net set { credentials = value; } } -#if NET_2_0 [MonoTODO] public static new RequestCachePolicy DefaultCachePolicy { @@ -324,7 +313,6 @@ namespace System.Net throw GetMustImplement (); } } -#endif public string Expect { get { return webHeaders ["Expect"]; } @@ -402,7 +390,6 @@ namespace System.Net } } -#if NET_1_1 [MonoTODO ("Use this")] public int MaximumResponseHeadersLength { get { return maxResponseHeadersLength; } @@ -415,11 +402,7 @@ namespace System.Net set { defaultMaxResponseHeadersLength = value; } } - public -#else - internal -#endif - int ReadWriteTimeout { + public int ReadWriteTimeout { get { return readWriteTimeout; } set { if (requestSent) @@ -473,11 +456,6 @@ namespace System.Net get { return proxy; } set { CheckRequestStarted (); -#if ONLY_1_1 - if (value == null) - throw new ArgumentNullException ("value"); -#endif - proxy = value; servicePoint = null; // we may need a new one } @@ -544,27 +522,23 @@ namespace System.Net } } -#if NET_2_0 public override bool UseDefaultCredentials { get { return CredentialCache.DefaultCredentials == Credentials; } set { Credentials = value ? CredentialCache.DefaultCredentials : null; } } -#endif public string UserAgent { get { return webHeaders ["User-Agent"]; } set { webHeaders.SetInternal ("User-Agent", value); } } -#if NET_1_1 bool unsafe_auth_blah; public bool UnsafeAuthenticatedConnectionSharing { get { return unsafe_auth_blah; } set { unsafe_auth_blah = value; } } -#endif internal bool GotRequestStream { get { return gotRequestStream; } @@ -636,12 +610,6 @@ namespace System.Net throw new InvalidOperationException ("rangeSpecifier"); webHeaders.RemoveAndAdd ("Range", value + from + "-" + to); } -#if !NET_2_0 - public override int GetHashCode () - { - return base.GetHashCode (); - } -#endif public override IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) { @@ -743,16 +711,6 @@ namespace System.Net if (method == null) throw new ProtocolViolationException ("Method is null."); -#if !NET_2_0 - bool send = !(method == "GET" || method == "CONNECT" || method == "HEAD" || - method == "TRACE" || method == "DELETE"); - if (send && contentLength < 0 && !sendChunked && !allowBuffering && KeepAlive) - throw new ProtocolViolationException ("Buffering is disabled, ContentLength is negative and SendChunked is disabled."); - - if (!send && (contentLength > -1 || sendChunked)) - throw new ProtocolViolationException ("ContentLength can't be set for non-write operations."); -#endif - string transferEncoding = TransferEncoding; if (!sendChunked && transferEncoding != null && transferEncoding.Trim () != "") throw new ProtocolViolationException ("SendChunked should be true."); @@ -895,11 +853,8 @@ namespace System.Net GetObjectData (serializationInfo, streamingContext); } -#if NET_2_0 - protected override -#endif - void GetObjectData (SerializationInfo serializationInfo, - StreamingContext streamingContext) + protected override void GetObjectData (SerializationInfo serializationInfo, + StreamingContext streamingContext) { SerializationInfo info = serializationInfo; @@ -1038,7 +993,6 @@ namespace System.Net webHeaders.SetInternal ("Cookie", cookieHeader); } -#if NET_2_0 string accept_encoding = null; if ((auto_decomp & DecompressionMethods.GZip) != 0) accept_encoding = "gzip"; @@ -1046,7 +1000,7 @@ namespace System.Net accept_encoding = accept_encoding != null ? "gzip, deflate" : "deflate"; if (accept_encoding != null) webHeaders.RemoveAndAdd ("Accept-Encoding", accept_encoding); -#endif + if (!usedPreAuth && preAuthenticate) DoPreAuthenticate (); @@ -1226,9 +1180,7 @@ namespace System.Net ICredentials creds = (!isProxy) ? credentials : proxy.Credentials; if (creds != null) { cnc.NtlmCredential = creds.GetCredential (requestUri, "NTLM"); -#if NET_1_1 cnc.UnsafeAuthenticatedConnectionSharing = unsafe_auth_blah; -#endif } } r.Reset (); diff --git a/mcs/class/System/System.Net/HttpWebResponse.cs b/mcs/class/System/System.Net/HttpWebResponse.cs index 8eb5b7f84ee..83eef98ca69 100644 --- a/mcs/class/System/System.Net/HttpWebResponse.cs +++ b/mcs/class/System/System.Net/HttpWebResponse.cs @@ -36,18 +36,19 @@ using System; using System.Collections; using System.Globalization; using System.IO; +using System.IO.Compression; using System.Net.Sockets; using System.Runtime.Serialization; using System.Text; -#if NET_2_0 -using System.IO.Compression; -#endif namespace System.Net { +#if MOONLIGHT + internal class HttpWebResponse : WebResponse, ISerializable, IDisposable { +#else [Serializable] - public class HttpWebResponse : WebResponse, ISerializable, IDisposable - { + public class HttpWebResponse : WebResponse, ISerializable, IDisposable { +#endif Uri uri; WebHeaderCollection webHeaders; CookieCollection cookieCollection; @@ -77,13 +78,8 @@ namespace System.Net try { string cl = webHeaders ["Content-Length"]; -#if NET_2_0 if (String.IsNullOrEmpty (cl) || !Int64.TryParse (cl, out contentLength)) contentLength = -1; -#else - if (cl != null && cl != String.Empty) - contentLength = (long) UInt64.Parse (cl); -#endif } catch (Exception) { contentLength = -1; } @@ -92,18 +88,15 @@ namespace System.Net this.cookie_container = container; FillCookies (); } -#if NET_2_0 + string content_encoding = webHeaders ["Content-Encoding"]; if (content_encoding == "gzip" && (data.request.AutomaticDecompression & DecompressionMethods.GZip) != 0) stream = new GZipStream (stream, CompressionMode.Decompress); else if (content_encoding == "deflate" && (data.request.AutomaticDecompression & DecompressionMethods.Deflate) != 0) stream = new DeflateStream (stream, CompressionMode.Decompress); -#endif } -#if NET_2_0 [Obsolete ("Serialization is obsoleted for this type", false)] -#endif protected HttpWebResponse (SerializationInfo serializationInfo, StreamingContext streamingContext) { SerializationInfo info = serializationInfo; @@ -181,14 +174,10 @@ namespace System.Net public override WebHeaderCollection Headers { get { -#if ONLY_1_1 - CheckDisposed (); -#endif return webHeaders; } } -#if NET_2_0 static Exception GetMustImplement () { return new NotImplementedException (); @@ -201,7 +190,6 @@ namespace System.Net throw GetMustImplement (); } } -#endif public DateTime LastModified { get { @@ -257,12 +245,6 @@ namespace System.Net } // Methods -#if !NET_2_0 - public override int GetHashCode () - { - return base.GetHashCode (); - } -#endif public string GetResponseHeader (string headerName) { @@ -299,11 +281,8 @@ namespace System.Net GetObjectData (serializationInfo, streamingContext); } -#if NET_2_0 - protected override -#endif - void GetObjectData (SerializationInfo serializationInfo, - StreamingContext streamingContext) + protected override void GetObjectData (SerializationInfo serializationInfo, + StreamingContext streamingContext) { SerializationInfo info = serializationInfo; @@ -330,9 +309,6 @@ namespace System.Net GC.SuppressFinalize (this); } -#if !NET_2_0 - protected virtual -#endif void Dispose (bool disposing) { if (this.disposed) @@ -342,9 +318,6 @@ namespace System.Net if (disposing) { // release managed resources uri = null; -#if !NET_2_0 - webHeaders = null; -#endif cookieCollection = null; method = null; version = null; @@ -414,11 +387,9 @@ namespace System.Net if (cookie.Domain == "") cookie.Domain = val; break; -#if NET_2_0 case "HTTPONLY": cookie.HttpOnly = true; break; -#endif case "MAX-AGE": // RFC Style Set-Cookie2 if (cookie.Expires == DateTime.MinValue) { try { @@ -485,14 +456,8 @@ namespace System.Net DateTime cookieExpiresUtc = DateTime.ParseExact (value, cookieExpiresFormats [i], CultureInfo.InvariantCulture); //convert UTC/GMT time to local time -#if NET_2_0 cookieExpiresUtc = DateTime.SpecifyKind (cookieExpiresUtc, DateTimeKind.Utc); return TimeZone.CurrentTimeZone.ToLocalTime (cookieExpiresUtc); -#else - //DateTime.Kind is only available on .NET 2.0, so do some calculation - TimeSpan localOffset = TimeZone.CurrentTimeZone.GetUtcOffset (cookieExpiresUtc.Date); - return cookieExpiresUtc.Add (localOffset); -#endif } catch {} } diff --git a/mcs/class/System/System.Net/IAuthenticationModule.cs b/mcs/class/System/System.Net/IAuthenticationModule.cs index b48e5d5ff85..76076c03ef3 100644 --- a/mcs/class/System/System.Net/IAuthenticationModule.cs +++ b/mcs/class/System/System.Net/IAuthenticationModule.cs @@ -33,8 +33,11 @@ namespace System.Net { // // Authentication interface for Web client authentication modules. // - public interface IAuthenticationModule - { +#if MOONLIGHT + internal interface IAuthenticationModule { +#else + public interface IAuthenticationModule { +#endif Authorization Authenticate (string challenge, WebRequest request, ICredentials credentials); Authorization PreAuthenticate (WebRequest request, ICredentials credentials); string AuthenticationType { get; } diff --git a/mcs/class/System/System.Net/ICertificatePolicy.cs b/mcs/class/System/System.Net/ICertificatePolicy.cs index 43cfa91b20d..98d8081af14 100644 --- a/mcs/class/System/System.Net/ICertificatePolicy.cs +++ b/mcs/class/System/System.Net/ICertificatePolicy.cs @@ -30,9 +30,11 @@ using System.Security.Cryptography.X509Certificates; namespace System.Net { - // - // +#if MOONLIGHT + internal interface ICertificatePolicy { +#else public interface ICertificatePolicy { +#endif bool CheckValidationResult ( ServicePoint srvPoint, X509Certificate certificate, diff --git a/mcs/class/System/System.Net/ICredentialPolicy.cs b/mcs/class/System/System.Net/ICredentialPolicy.cs index 1b1d0070f43..a8d37e7d018 100644 --- a/mcs/class/System/System.Net/ICredentialPolicy.cs +++ b/mcs/class/System/System.Net/ICredentialPolicy.cs @@ -26,12 +26,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 - namespace System.Net { +#if MOONLIGHT + internal interface ICredentialPolicy { +#else public interface ICredentialPolicy { - +#endif bool ShouldSendCredential (Uri challengeUri, WebRequest request, NetworkCredential credential, @@ -40,4 +41,3 @@ namespace System.Net { } } -#endif diff --git a/mcs/class/System/System.Net/IWebRequestCreate.cs b/mcs/class/System/System.Net/IWebRequestCreate.cs index af6a24ddf5b..d6cd6f493bc 100644 --- a/mcs/class/System/System.Net/IWebRequestCreate.cs +++ b/mcs/class/System/System.Net/IWebRequestCreate.cs @@ -28,9 +28,11 @@ namespace System.Net { - // - // +#if MOONLIGHT && INSIDE_SYSTEM + internal interface IWebRequestCreate { +#else public interface IWebRequestCreate { +#endif WebRequest Create (Uri uri); } } diff --git a/mcs/class/System/System.Net/ServicePoint.cs b/mcs/class/System/System.Net/ServicePoint.cs index 80f9110741c..c93f36d1bba 100644 --- a/mcs/class/System/System.Net/ServicePoint.cs +++ b/mcs/class/System/System.Net/ServicePoint.cs @@ -271,7 +271,7 @@ namespace System.Net protocolVersion = version; } -#if !MOONLIGHT && !TARGET_JVM +#if !TARGET_JVM WebConnectionGroup GetConnectionGroup (string name) { if (name == null) diff --git a/mcs/class/System/System.Net/ServicePointManager.cs b/mcs/class/System/System.Net/ServicePointManager.cs index 016eee02bb3..034a5d0d5c6 100644 --- a/mcs/class/System/System.Net/ServicePointManager.cs +++ b/mcs/class/System/System.Net/ServicePointManager.cs @@ -69,8 +69,11 @@ using MSX = Mono.Security.X509; namespace System.Net { - public class ServicePointManager - { +#if MOONLIGHT + internal class ServicePointManager { +#else + public class ServicePointManager { +#endif class SPKey { Uri uri; // schema/host/port bool use_connect; @@ -130,14 +133,14 @@ namespace System.Net public const int DefaultNonPersistentConnectionLimit = 4; public const int DefaultPersistentConnectionLimit = 2; -#if !MONOTOUCH +#if !NET_2_1 const string configKey = "system.net/connectionManagement"; static ConnectionManagementData manager; #endif static ServicePointManager () { -#if !MONOTOUCH +#if !NET_2_1 #if NET_2_0 && CONFIGURATION_DEP object cfg = ConfigurationManager.GetSection (configKey); ConnectionManagementSection s = cfg as ConnectionManagementSection; @@ -326,7 +329,7 @@ namespace System.Net throw new InvalidOperationException ("maximum number of service points reached"); string addr = address.ToString (); -#if MONOTOUCH +#if NET_2_1 int limit = defaultConnectionLimit; #else int limit = (int) manager.GetMaxConnections (addr); diff --git a/mcs/class/System/System.Net/WebException.cs b/mcs/class/System/System.Net/WebException.cs index be4446b7a0c..1e401660db6 100644 --- a/mcs/class/System/System.Net/WebException.cs +++ b/mcs/class/System/System.Net/WebException.cs @@ -30,9 +30,12 @@ using System.Runtime.Serialization; namespace System.Net { +#if MOONLIGHT && INSIDE_SYSTEM + internal class WebException : InvalidOperationException, ISerializable { +#else [Serializable] - public class WebException : InvalidOperationException, ISerializable - { + public class WebException : InvalidOperationException, ISerializable { +#endif private WebResponse response; private WebExceptionStatus status = WebExceptionStatus.UnknownError; @@ -97,12 +100,10 @@ namespace System.Net } #endif -#if NET_2_0 public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext) { base.GetObjectData (serializationInfo, streamingContext); } -#endif } } diff --git a/mcs/class/System/System.Net/WebHeaderCollection.cs b/mcs/class/System/System.Net/WebHeaderCollection.cs index ae4598f0383..16f77533a40 100644 --- a/mcs/class/System/System.Net/WebHeaderCollection.cs +++ b/mcs/class/System/System.Net/WebHeaderCollection.cs @@ -33,9 +33,7 @@ using System; using System.Collections; -#if NET_2_0 using System.Collections.Generic; -#endif using System.Collections.Specialized; using System.Runtime.InteropServices; using System.Runtime.Serialization; @@ -45,15 +43,16 @@ using System.Text; namespace System.Net { +#if MOONLIGHT + internal class WebHeaderCollection : NameValueCollection, ISerializable { +#else [Serializable] [ComVisible(true)] - public class WebHeaderCollection : NameValueCollection, ISerializable - { + public class WebHeaderCollection : NameValueCollection, ISerializable { +#endif private static readonly Hashtable restricted; private static readonly Hashtable multiValue; -#if NET_2_0 static readonly Dictionary restricted_response; -#endif private bool internallyCreated = false; // Static Initializer @@ -80,12 +79,11 @@ namespace System.Net restricted.Add ("proxy-connection", true); // -#if NET_2_0 restricted_response = new Dictionary (StringComparer.InvariantCultureIgnoreCase); restricted_response.Add ("Content-Length", true); restricted_response.Add ("Transfer-Encoding", true); restricted_response.Add ("WWW-Authenticate", true); -#endif + // see par 14 of RFC 2068 to see which header names // accept multiple values each separated by a comma multiValue = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant, @@ -263,7 +261,6 @@ namespace System.Net return restricted.ContainsKey (headerName); } -#if NET_2_0 public static bool IsRestricted (string headerName, bool response) { if (String.IsNullOrEmpty (headerName)) @@ -277,7 +274,6 @@ namespace System.Net return restricted_response.ContainsKey (headerName); return restricted.ContainsKey (headerName); } -#endif public override void OnDeserialization (object sender) { @@ -380,7 +376,6 @@ namespace System.Net return(base.GetKey (index)); } -#if NET_2_0 public void Add (HttpRequestHeader header, string value) { Add (RequestHeaderToString (header), value); @@ -603,7 +598,6 @@ namespace System.Net { return(base.GetEnumerator ()); } -#endif // Internal Methods diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs index 43ddcaaffd3..06f3c72b4dc 100644 --- a/mcs/class/System/System.Net/WebRequest.cs +++ b/mcs/class/System/System.Net/WebRequest.cs @@ -40,7 +40,7 @@ using System.Net.Cache; using System.Security.Principal; #endif -#if MONOTOUCH +#if NET_2_1 using ConfigurationException = System.ArgumentException; namespace System.Net.Configuration { @@ -50,9 +50,12 @@ namespace System.Net.Configuration { namespace System.Net { +#if MOONLIGHT + internal abstract class WebRequest : ISerializable { +#else [Serializable] - public abstract class WebRequest : MarshalByRefObject, ISerializable - { + public abstract class WebRequest : MarshalByRefObject, ISerializable { +#endif static HybridDictionary prefixes = new HybridDictionary (); #if NET_2_0 static bool isDefaultWebProxySet; @@ -63,13 +66,15 @@ namespace System.Net static WebRequest () { -#if MONOTOUCH +#if NET_2_1 AddPrefix ("http", typeof (HttpRequestCreator)); AddPrefix ("https", typeof (HttpRequestCreator)); + #if MONOTOUCH AddPrefix ("file", typeof (FileWebRequestCreator)); AddPrefix ("ftp", typeof (FtpRequestCreator)); + #endif #else -#if NET_2_0 && CONFIGURATION_DEP + #if NET_2_0 && CONFIGURATION_DEP object cfg = ConfigurationManager.GetSection ("system.net/webRequestModules"); WebRequestModulesSection s = cfg as WebRequestModulesSection; if (s != null) { @@ -78,7 +83,7 @@ namespace System.Net AddPrefix (el.Prefix, el.Type); return; } -#endif + #endif ConfigurationSettings.GetConfig ("system.net/webRequestModules"); #endif } @@ -161,7 +166,7 @@ namespace System.Net set { throw GetMustImplement (); } } -#if NET_2_0 +#if NET_2_0 && !MOONLIGHT public TokenImpersonationLevel ImpersonationLevel { get { throw GetMustImplement (); } set { throw GetMustImplement (); } diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs index ac5fbc25465..b87d65b40c2 100644 --- a/mcs/class/System/System.Net/WebResponse.cs +++ b/mcs/class/System/System.Net/WebResponse.cs @@ -32,9 +32,12 @@ using System.Runtime.Serialization; namespace System.Net { +#if MOONLIGHT + internal abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable { +#else [Serializable] - public abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable - { + public abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable { +#endif // Constructors protected WebResponse () { } @@ -60,7 +63,6 @@ namespace System.Net get { throw new NotSupportedException (); } } -#if NET_2_0 static Exception GetMustImplement () { return new NotImplementedException (); @@ -81,7 +83,6 @@ namespace System.Net throw GetMustImplement (); } } -#endif public virtual Uri ResponseUri { get { throw new NotSupportedException (); } @@ -114,12 +115,10 @@ namespace System.Net throw new NotSupportedException (); } -#if NET_2_0 [MonoTODO] protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext) { throw GetMustImplement (); } -#endif } } diff --git a/mcs/class/System/System.Timers/ChangeLog b/mcs/class/System/System.Timers/ChangeLog index 1ef812cbaa4..e417d1b4d09 100644 --- a/mcs/class/System/System.Timers/ChangeLog +++ b/mcs/class/System/System.Timers/ChangeLog @@ -1,3 +1,8 @@ +2010-03-19 Sebastien Pouliot + + * Timer.cs: Removed old NET_2_0 defines and added some new + MOONLIGHT defines (needed for the client stack) + 2009-09-29 Sebastien Pouliot * Timer_2_1.cs: Removed. No longer needed by Moonlight diff --git a/mcs/class/System/System.Timers/Timer.cs b/mcs/class/System/System.Timers/Timer.cs index fc907a6a8d4..6126b9dcb65 100644 --- a/mcs/class/System/System.Timers/Timer.cs +++ b/mcs/class/System/System.Timers/Timer.cs @@ -35,10 +35,13 @@ using System.Threading; namespace System.Timers { +#if MOONLIGHT + internal class Timer { +#else [DefaultEventAttribute("Elapsed")] [DefaultProperty("Interval")] - public class Timer : Component, ISupportInitialize - { + public class Timer : Component, ISupportInitialize { +#endif double interval; bool autoReset; System.Threading.Timer timer; @@ -55,11 +58,9 @@ namespace System.Timers public Timer (double interval) { -#if NET_2_0 // MSBUG: https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296761 if (interval > 0x7FFFFFFF) throw new ArgumentException ("Invalid value: " + interval, "interval"); -#endif autoReset = true; Interval = interval; @@ -119,18 +120,17 @@ namespace System.Timers } } +#if !MOONLIGHT public override ISite Site { get { return base.Site; } set { base.Site = value; } } - +#endif [DefaultValue(null)] [TimersDescriptionAttribute("The object used to marshal the event handler calls issued " + "when an interval has elapsed.")] -#if NET_2_0 [Browsable (false)] -#endif public ISynchronizeInvoke SynchronizingObject { get { return so; } @@ -162,11 +162,18 @@ namespace System.Timers Enabled = false; } +#if MOONLIGHT + protected void Dispose (bool disposing) + { + Close (); + } +#else protected override void Dispose (bool disposing) { Close (); base.Dispose (disposing); } +#endif static void Callback (object state) { diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog index 1daab153737..5c3fc86ceaf 100644 --- a/mcs/class/System/System/ChangeLog +++ b/mcs/class/System/System/ChangeLog @@ -1,3 +1,7 @@ +2010-03-19 Sebastien Pouliot + + * Uri.cs: Remove some MOONLIGHT defines + 2010-03-16 Jb Evain * Uri.cs, UriTypeConverter.cs: use MOONLIGHT symbol to diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs index 303c9411244..b5ace00284f 100644 --- a/mcs/class/System/System/Uri.cs +++ b/mcs/class/System/System/Uri.cs @@ -479,7 +479,7 @@ namespace System { return host; } } -#if !MOONLIGHT + public UriHostNameType HostNameType { get { EnsureAbsoluteUri (); @@ -500,8 +500,6 @@ namespace System { } } -#endif // NET_2_1 - public bool IsDefaultPort { get { EnsureAbsoluteUri (); @@ -516,7 +514,6 @@ namespace System { } } -#if !MOONLIGHT public bool IsLoopback { get { EnsureAbsoluteUri (); @@ -547,8 +544,6 @@ namespace System { } } -#endif // NET_2_1 - public bool IsUnc { // rule: This should be true only if // - uri string starts from "\\", or diff --git a/mcs/class/System/moonlight_bootstrap_System.dll.sources b/mcs/class/System/moonlight_bootstrap_System.dll.sources index 4c12aa1dff0..f54a6127b1a 100644 --- a/mcs/class/System/moonlight_bootstrap_System.dll.sources +++ b/mcs/class/System/moonlight_bootstrap_System.dll.sources @@ -1,4 +1,6 @@ ../../build/common/Consts.cs ../../build/common/Locale.cs ../../build/common/MonoTODOAttribute.cs +../corlib/System.Collections/CollectionDebuggerView.cs +../corlib/System.Collections.Generic/CollectionDebuggerView.cs #include moonlight_raw_System.dll.sources diff --git a/mcs/class/System/moonlight_raw_System.dll.sources b/mcs/class/System/moonlight_raw_System.dll.sources index 8f6c217fc1c..af6f2ec368e 100644 --- a/mcs/class/System/moonlight_raw_System.dll.sources +++ b/mcs/class/System/moonlight_raw_System.dll.sources @@ -1,4 +1,5 @@ Assembly/AssemblyInfo.cs +Mono.Http/NtlmClient.cs System.CodeDom.Compiler/GeneratedCodeAttribute.cs System.Collections.Generic/ISet.cs System.Collections.Generic/LinkedList.cs @@ -10,21 +11,31 @@ System.Collections.Generic/SortedList.cs System.Collections.Generic/Stack.cs System.Collections.Specialized/BitVector32.cs System.Collections.Specialized/CollectionsUtil.cs +System.Collections.Specialized/IOrderedDictionary.cs System.Collections.Specialized/ListDictionary.cs System.Collections.Specialized/HybridDictionary.cs +System.Collections.Specialized/NameObjectCollectionBase.cs +System.Collections.Specialized/NameValueCollection.cs +System.Collections.Specialized/OrderedDictionary.cs +System.Collections.Specialized/StringCollection.cs System.Collections.Specialized/StringDictionary.cs +System.Collections.Specialized/StringEnumerator.cs System.ComponentModel/AsyncCompletedEventArgs.cs System.ComponentModel/AsyncCompletedEventHandler.cs System.ComponentModel/AsyncOperation.cs System.ComponentModel/AsyncOperationManager.cs System.ComponentModel/BackgroundWorker.cs +System.ComponentModel/BrowsableAttribute.cs System.ComponentModel/CancelEventArgs.cs System.ComponentModel/CategoryAttribute.cs System.ComponentModel/ComponentCollection.cs +System.ComponentModel/DefaultEventAttribute.cs +System.ComponentModel/DefaultPropertyAttribute.cs System.ComponentModel/DefaultValueAttribute.cs System.ComponentModel/DescriptionAttribute.cs System.ComponentModel/DoWorkEventHandler.cs System.ComponentModel/DoWorkEventArgs.cs +System.ComponentModel/EditorAttribute.cs System.ComponentModel/EditorBrowsableAttribute.cs System.ComponentModel/EditorBrowsableState.cs System.ComponentModel/IChangeTracking.cs @@ -36,6 +47,7 @@ System.ComponentModel/INotifyPropertyChanged.cs System.ComponentModel/InvalidEnumArgumentException.cs System.ComponentModel/IRevertibleChangeTracking.cs System.ComponentModel/ISite.cs +System.ComponentModel/ISynchronizeInvoke.cs System.ComponentModel/ITypeDescriptorContext.cs System.ComponentModel/ListSortDirection.cs System.ComponentModel/ProgressChangedEventHandler.cs @@ -44,6 +56,7 @@ System.ComponentModel/PropertyChangedEventArgs.cs System.ComponentModel/PropertyChangedEventHandler.cs System.ComponentModel/PropertyDescriptor.cs System.ComponentModel/ReadOnlyAttribute.cs +System.ComponentModel/RecommendedAsConfigurableAttribute.cs System.ComponentModel/RunWorkerCompletedEventArgs.cs System.ComponentModel/RunWorkerCompletedEventHandler.cs System.ComponentModel/TypeConverterAttribute.cs @@ -54,12 +67,184 @@ System/FileStyleUriParser.cs System/FtpStyleUriParser.cs System/GenericUriParser.cs System/GenericUriParserOptions.cs +System/GopherStyleUriParser.cs System/HttpStyleUriParser.cs System/UriIdnScope.cs System/UriTypeConverter.cs +System.IO.Compression/CompressionMode.cs +System.IO.Compression/DeflateStream.cs +System.IO.Compression/GZipStream.cs +System.IO/ErrorEventArgs.cs +System.IO/ErrorEventHandler.cs +System.IO/FileAction.cs +System.IO/FileSystemEventArgs.cs +System.IO/FileSystemEventHandler.cs +System.IO/InternalBufferOverflowException.cs +System.IO/InvalidDataException.cs +System.IO/IODescriptionAttribute.cs +System.IO/MonoIO.cs +System.IO/MonoIOError.cs +System.IO/MonoSyncFileStream.cs +System.IO/NotifyFilters.cs +System.IO/RenamedEventArgs.cs +System.IO/RenamedEventHandler.cs +System.IO/SearchPattern.cs +System.IO/WaitForChangedResult.cs +System.IO/WatcherChangeTypes.cs +System/IUriData.cs +System/LdapStyleUriParser.cs +System.Net/AuthenticationManager.cs +System.Net/AuthenticationSchemes.cs +System.Net/AuthenticationSchemeSelector.cs +System.Net/Authorization.cs +System.Net/BasicClient.cs +System.Net/BindIPEndPoint.cs +System.Net.Cache/HttpCacheAgeControl.cs +System.Net.Cache/HttpRequestCacheLevel.cs +System.Net.Cache/HttpRequestCachePolicy.cs +System.Net.Cache/RequestCacheLevel.cs +System.Net.Cache/RequestCachePolicy.cs +System.Net/ChunkedInputStream.cs +System.Net/ChunkStream.cs +System.Net/ConnectionModes.cs +System.Net/CookieCollection.cs +System.Net/CookieContainer.cs +System.Net/Cookie.cs +System.Net/CookieException.cs +System.Net/CredentialCache.cs +System.Net/DecompressionMethods.cs +System.Net/DefaultCertificatePolicy.cs +System.Net/DigestClient.cs +System.Net/Dns.cs +System.Net/DnsEndPoint.cs +System.Net/EndPoint.cs +System.Net/GlobalProxySelection.cs +System.Net/HttpConnection.cs +System.Net/HttpContinueDelegate.cs +System.Net/HttpRequestCreator.cs +System.Net/HttpRequestHeader.cs +System.Net/HttpResponseHeader.cs +System.Net/HttpStatusCode.cs +System.Net/HttpStreamAsyncResult.cs +System.Net/HttpUtility.cs +System.Net/HttpVersion.cs +System.Net/HttpWebRequest.cs +System.Net/HttpWebResponse.cs +System.Net/IAuthenticationModule.cs +System.Net/ICertificatePolicy.cs +System.Net/ICredentialLookup.cs +System.Net/ICredentialPolicy.cs +System.Net/ICredentialsByHost.cs System.Net/IPAddress.cs +System.Net/IPEndPoint.cs +System.Net/IPHostEntry.cs System.Net/IPv6Address.cs +System.Net/IWebProxy.cs +System.Net/IWebProxyScript.cs +System.Net/IWebRequestCreate.cs +System.Net/ListenerAsyncResult.cs +System.Net/ListenerPrefix.cs +System.Net/MonoHttpDate.cs +System.Net/NetworkAccess.cs +System.Net/NetworkCredential.cs +System.Net/NtlmClient.cs +System/NetPipeStyleUriParser.cs +System.Net/ProtocolViolationException.cs +System.Net/RequestStream.cs +System.Net/ResponseStream.cs +System.Net.Security/AuthenticatedStream.cs +System.Net.Security/AuthenticationLevel.cs +System.Net.Security/LocalCertificateSelectionCallback.cs +System.Net.Security/ProtectionLevel.cs +System.Net/SecurityProtocolType.cs +System.Net.Security/RemoteCertificateValidationCallback.cs +System.Net.Security/SslStream.cs +System.Net.Security/SslPolicyErrors.cs +System.Net/ServicePoint.cs +System.Net/ServicePointManager.cs +System.Net/SocketAddress.cs System.Net.Sockets/AddressFamily.cs +System.Net.Sockets/IOControlCode.cs +System.Net.Sockets/IPv6MulticastOption.cs +System.Net.Sockets/IPPacketInformation.cs +System.Net.Sockets/LingerOption.cs +System.Net.Sockets/MulticastOption.cs +System.Net.Sockets/NetworkStream.cs +System.Net.Sockets/ProtocolFamily.cs +System.Net.Sockets/ProtocolType.cs +System.Net.Sockets/SelectMode.cs +System.Net.Sockets/SendPacketsElement.cs +System.Net.Sockets/Socket.cs +System.Net.Sockets/Socket_2_1.cs +System.Net.Sockets/SocketAsyncEventArgs.cs +System.Net.Sockets/SocketAsyncOperation.cs +System.Net.Sockets/SocketError.cs +../System.Net/System.Net.Sockets/SocketException_2_1.cs +System.Net.Sockets/SocketFlags.cs +System.Net.Sockets/SocketInformation.cs +System.Net.Sockets/SocketInformationOptions.cs +System.Net.Sockets/SocketOptionLevel.cs +System.Net.Sockets/SocketOptionName.cs +System.Net.Sockets/SocketShutdown.cs +System.Net.Sockets/SocketType.cs +System.Net.Sockets/TcpClient.cs +System.Net.Sockets/TcpListener.cs +System.Net.Sockets/TransmitFileOptions.cs +System.Net.Sockets/UdpClient.cs +System/NetTcpStyleUriParser.cs +System.Net/TransportType.cs +System.Net/WebAsyncResult.cs +System.Net/WebConnection.cs +System.Net/WebConnectionData.cs +System.Net/WebConnectionGroup.cs +System.Net/WebConnectionStream.cs +System.Net/WebException.cs +System.Net/WebExceptionStatus.cs +System.Net/WebHeaderCollection.cs +System.Net/WebProxy.cs +System.Net/WebRequest.cs +System.Net/WebRequestMethods.cs +System.Net/WebResponse.cs +System/NewsStyleUriParser.cs +System.Security.Authentication/AuthenticationException.cs +System.Security.Authentication/CipherAlgorithmType.cs +System.Security.Authentication/ExchangeAlgorithmType.cs +System.Security.Authentication/HashAlgorithmType.cs +System.Security.Authentication/SslProtocols.cs +System.Security.Authentication/InvalidCredentialException.cs +System.Security.Cryptography.X509Certificates/OpenFlags.cs +System.Security.Cryptography.X509Certificates/PublicKey.cs +System.Security.Cryptography.X509Certificates/StoreLocation.cs +System.Security.Cryptography.X509Certificates/StoreName.cs +System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs +System.Security.Cryptography.X509Certificates/X500DistinguishedNameFlags.cs +System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs +System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs +System.Security.Cryptography.X509Certificates/X509Certificate2.cs +System.Security.Cryptography.X509Certificates/X509Certificate2Enumerator.cs +System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs +System.Security.Cryptography.X509Certificates/X509Chain.cs +System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs +System.Security.Cryptography.X509Certificates/X509ChainElement.cs +System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs +System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs +System.Security.Cryptography.X509Certificates/X509ChainStatus.cs +System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs +System.Security.Cryptography.X509Certificates/X509EnhancedKeyUsageExtension.cs +System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs +System.Security.Cryptography.X509Certificates/X509Extension.cs +System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs +System.Security.Cryptography.X509Certificates/X509FindType.cs +System.Security.Cryptography.X509Certificates/X509IncludeOption.cs +System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs +System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs +System.Security.Cryptography.X509Certificates/X509NameType.cs +System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs +System.Security.Cryptography.X509Certificates/X509RevocationMode.cs +System.Security.Cryptography.X509Certificates/X509Store.cs +System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs +System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierHashAlgorithm.cs +System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs System/SRDescriptionAttribute.cs System.Text.RegularExpressions/arch.cs System.Text.RegularExpressions/BaseMachine.cs @@ -85,15 +270,17 @@ System.Text.RegularExpressions/RxInterpreter.cs System.Text.RegularExpressions/RxOp.cs System.Text.RegularExpressions/replace.cs System.Text.RegularExpressions/syntax.cs +System.Timers/ElapsedEventArgs.cs +System.Timers/ElapsedEventHandler.cs +System.Timers/Timer.cs +System.Timers/TimersDescriptionAttribute.cs System/UriBuilder.cs System/UriComponents.cs System/Uri.cs +System/UriData.cs System/UriFormat.cs System/UriFormatException.cs System/UriHostNameType.cs System/UriKind.cs System/UriParser.cs System/UriPartial.cs - -../corlib/System.Collections/CollectionDebuggerView.cs -../corlib/System.Collections.Generic/CollectionDebuggerView.cs -- 2.25.1