2009-08-17 Sebastien Pouliot <sebastien@ximian.com>

	* CookieCollection.cs: Seal class for NET_2_1 (SL3)
	* CookieContainer.cs: Seal class for NET_2_1 (SL3)
	* NetworkCredential.cs: Use in NET_2_1 (SL3) but without implementing
	ICredentialsByHost

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

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 20e6effe3aea2c902722967385ceb0a423a0abe4..8f348361cb8a2e60756dcbc9335b9d414a63275f 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-17  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * CookieCollection.cs: Seal class for NET_2_1 (SL3)
+       * CookieContainer.cs: Seal class for NET_2_1 (SL3)
+       * NetworkCredential.cs: Use in NET_2_1 (SL3) but without implementing
+       ICredentialsByHost
+
 2009-08-13 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * HttpWebRequest.cs:

diff --git a/mcs/class/System/System.Net/CookieCollection.cs b/mcs/class/System/System.Net/CookieCollection.cs
index a7528bdf8df03facdcc4f908a0b07782ecea5f3b..b2ddafba9991237ed08cf8963dd6e2fa1a49eae4 100644 (file)
--- a/mcs/class/System/System.Net/CookieCollection.cs
+++ b/mcs/class/System/System.Net/CookieCollection.cs
@@ -37,8 +37,11 @@ using System.Runtime.Serialization;
 namespace System.Net 
 {
        [Serializable]
-       public class CookieCollection : ICollection, IEnumerable
-       {
+#if NET_2_1
+       public sealed class CookieCollection : ICollection, IEnumerable {
+#else
+       public class CookieCollection : ICollection, IEnumerable {
+#endif
                class CookieCollectionPathComparer : IComparer
                {
                        int IComparer.Compare (object p1, object p2)

diff --git a/mcs/class/System/System.Net/CookieContainer.cs b/mcs/class/System/System.Net/CookieContainer.cs
index ff122f90d674c7c8c7fc0586539835ff70dad170..d8a1222e407c992d24128e80acf12c3b3e900834 100644 (file)
--- a/mcs/class/System/System.Net/CookieContainer.cs
+++ b/mcs/class/System/System.Net/CookieContainer.cs
@@ -40,8 +40,11 @@ namespace System.Net
 {
        [Serializable]
        [MonoTODO ("Need to remove older/unused cookies if it reaches the maximum capacity")]
-       public class CookieContainer
-       {
+#if NET_2_1
+       public sealed class CookieContainer {
+#else
+       public class CookieContainer {
+#endif
                public const int DefaultCookieLengthLimit = 4096;
                public const int DefaultCookieLimit = 300;
                public const int DefaultPerDomainCookieLimit = 20;

diff --git a/mcs/class/System/System.Net/NetworkCredential.cs b/mcs/class/System/System.Net/NetworkCredential.cs
index 5eea32028f2b8ecbbdd6eaf588d3214ad00470c3..2219e4b37dc2cdd585a7a60a328efd6bc942d3f9 100644 (file)
--- a/mcs/class/System/System.Net/NetworkCredential.cs
+++ b/mcs/class/System/System.Net/NetworkCredential.cs
@@ -30,7 +30,7 @@
 namespace System.Net
 {
        public class NetworkCredential : ICredentials
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
                                        , ICredentialsByHost
 #endif
        {
@@ -83,7 +83,7 @@ namespace System.Net
                        return this;
                }
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
                public NetworkCredential GetCredential (string host, int port, string authenticationType)
                {
                        return this;