Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@gnome.org>2014-11-02 03:36:49 +0300
committerMiguel de Icaza <miguel@gnome.org>2014-11-02 03:36:49 +0300
commite4d8f21cf6f6629ea80d4db5cc5086e24047491a (patch)
treeb7eb939c882876627a0583c462095f067c1f247b /mcs/class/System.Web.Abstractions
parent661430fd1f052c5589bcd5d116f37b9ee4e27210 (diff)
parentd35449e99bc1315657ec41de2c90661bb82fc66a (diff)
Merge pull request #1163 from AerisG222/more_mvc_fixes
Add missing elements to allow MVC5.2 site to run
Diffstat (limited to 'mcs/class/System.Web.Abstractions')
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs3
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs3
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs6
3 files changed, 10 insertions, 2 deletions
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
index 22feb8530d7..6581c0c1f77 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
@@ -183,10 +183,9 @@ namespace System.Web
return w.GetSection (sectionName);
}
- [MonoTODO]
public override object GetService (Type serviceType)
{
- throw new NotImplementedException ();
+ return ((IServiceProvider)w).GetService (serviceType);
}
#if NET_4_0
public override void RemapHandler (IHttpHandler handler)
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
index 3a31754b949..bf1d6f576aa 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
@@ -138,7 +138,10 @@ namespace System.Web
#if NET_4_5
public virtual ReadEntityBodyMode ReadEntityBodyMode { get { NotImplemented(); return ReadEntityBodyMode.Classic; } }
+
+ public virtual UnvalidatedRequestValuesBase Unvalidated { get { NotImplemented (); return null; } }
#endif
+
public virtual Uri Url { get { NotImplemented (); return null; } }
public virtual Uri UrlReferrer { get { NotImplemented (); return null; } }
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
index dc5098a3bec..35f631e37e7 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
@@ -208,6 +208,12 @@ namespace System.Web
get { return w.TotalBytes; }
}
+#if NET_4_5
+ public override UnvalidatedRequestValuesBase Unvalidated {
+ get { return new UnvalidatedRequestValuesWrapper (w.Unvalidated); }
+ }
+#endif
+
public override Uri Url {
get { return w.Url; }
}