Misc PCL-related API fixes.

mono · Mar 4, 2013 · 879250e · 879250e
1 parent 3a87e57
commit 879250e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/...ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationContext.cs b/...ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/ValidationContext.cs
@@ -65,7 +65,28 @@ public ValidationContext (object instance, IServiceProvider serviceProvider, IDi
 			// else
 			ServiceContainer = new ValidationContextServiceContainer ();
 		}
+
+#if NET_4_5
+		public ValidationContext (object instance)
+			: this (instance, null, null)
+		{
+		}
+
+		public ValidationContext (object instance, IDictionary<object, object> items)
+			: this (instance, null, items)
+		{
+		}
 
+		// FIXME: According to MSDN, this should be defined in
+		//        4.5, Silverlight and PCL
+		[MonoTODO]
+		public void InitializeServiceProvider (
+			Func<Type, Object> serviceProvider)
+		{
+			throw new NotImplementedException ();
+		}
+#endif
+
 		public object GetService (Type serviceType)
 		{
 			return ServiceContainer.GetService (serviceType);

diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs
@@ -559,9 +559,9 @@ static bool CheckValidHost (string scheme, string val)
 		internal ServicePoint ServicePointNoLock {
 			get { return servicePoint; }
 		}
-#if NET_4_5
+#if NET_4_0
 		[MonoTODO ("for portable library support")]
-		public bool SupportsCookieContainer { 
+		public virtual bool SupportsCookieContainer { 
 			get {
 				throw new NotImplementedException ();
 			}

diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs
@@ -296,7 +296,7 @@ public static WebRequest CreateDefault (Uri requestUri)
 				throw new ArgumentNullException ("requestUri");
 			return GetCreator (requestUri.Scheme).Create (requestUri);
 		}
-#if NET_4_5	
+#if NET_4_0
 		[MonoTODO ("for portable library support")]
 		public static HttpWebRequest CreateHttp (string requestUriString)
 		{

diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs
@@ -85,7 +85,7 @@ public virtual bool IsMutuallyAuthenticated
 		public virtual Uri ResponseUri {		
 			get { throw new NotSupportedException (); }
 		}		
-#if NET_4_5
+#if NET_4_0
 		[MonoTODO ("for portable library support")]
 		public virtual bool SupportsHeaders {
 			get { throw new NotImplementedException (); }