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:
authorZoltan Varga <vargaz@gmail.com>2015-01-14 00:06:31 +0300
committerZoltan Varga <vargaz@gmail.com>2015-01-14 00:06:31 +0300
commit032f313d5f3b99954cabb3e152b3c8d4424d5a2b (patch)
treee09b14b13cfb9b70197cc6255de6b3e91ce6cfb9 /mcs/class/System.Web.Abstractions
parentbc8041cbe5152a748be1ccb323611ae903cd4443 (diff)
[bcl] Remove NET_4_0 defines from class libs.
Diffstat (limited to 'mcs/class/System.Web.Abstractions')
-rw-r--r--mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs5
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs6
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs6
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs8
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs8
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs6
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs6
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs2
-rw-r--r--mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs2
23 files changed, 0 insertions, 77 deletions
diff --git a/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs
index 8055508ca60..b0e5072ddf6 100644
--- a/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs
@@ -60,15 +60,11 @@ using System.Web;
[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]
-#if !NET_4_0
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-#endif
[assembly: AllowPartiallyTrustedCallers]
// FIXME: We get collisions with this internalsVisibleTo because of Consts.cs and MonoTodo
//[assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-#if NET_4_0
[assembly: SecurityRules (SecurityRuleSet.Level2, SkipVerificationInFullTrust = true)]
[assembly: TypeForwardedTo (typeof (System.Web.HttpStaticObjectsCollectionBase))]
[assembly: TypeForwardedTo (typeof (System.Web.HttpStaticObjectsCollectionWrapper))]
@@ -92,4 +88,3 @@ using System.Web;
[assembly: TypeForwardedTo (typeof (System.Web.HttpRequestWrapper))]
[assembly: TypeForwardedTo (typeof (System.Web.HttpResponseWrapper))]
[assembly: TypeForwardedTo (typeof (System.Web.HttpResponseBase))]
-#endif
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs
index f0c6bd07c55..6310cc0d2fb 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateBase.cs
@@ -39,9 +39,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpApplicationStateBase : NameObjectCollectionBase, ICollection, IEnumerable
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs
index c9c5a6732bb..d0299ef73fd 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpApplicationStateWrapper.cs
@@ -40,9 +40,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpApplicationStateWrapper : HttpApplicationStateBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs
index 2a6376ce3a6..cd9139966f1 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesBase.cs
@@ -40,9 +40,7 @@ using System.Web.UI;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpBrowserCapabilitiesBase : IFilterResolutionService
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs
index 9185dae33a4..b5cc9638340 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpBrowserCapabilitiesWrapper.cs
@@ -40,9 +40,7 @@ using System.Web.UI;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpBrowserCapabilitiesWrapper : HttpBrowserCapabilitiesBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs
index 6f99f8970ff..70084749325 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyBase.cs
@@ -38,9 +38,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpCachePolicyBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs
index e604fc7ce0b..c2fad9de494 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpCachePolicyWrapper.cs
@@ -38,9 +38,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpCachePolicyWrapper : HttpCachePolicyBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs
index 37235b43f65..f81db297f8d 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpContextBase.cs
@@ -40,9 +40,7 @@ using System.Web.SessionState;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpContextBase : IServiceProvider
@@ -141,12 +139,10 @@ namespace System.Web
NotImplemented ();
return null;
}
-#if NET_4_0
public virtual void RemapHandler (IHttpHandler handler)
{
NotImplemented ();
}
-#endif
public virtual void RewritePath (string path)
{
NotImplemented ();
@@ -166,11 +162,9 @@ namespace System.Web
{
NotImplemented ();
}
-#if NET_4_0
public virtual void SetSessionStateBehavior (SessionStateBehavior sessionStateBehavior)
{
NotImplemented ();
}
-#endif
}
}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
index 6581c0c1f77..64975a813c0 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
@@ -40,9 +40,7 @@ using System.Web.SessionState;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpContextWrapper : HttpContextBase
@@ -187,12 +185,10 @@ namespace System.Web
{
return ((IServiceProvider)w).GetService (serviceType);
}
-#if NET_4_0
public override void RemapHandler (IHttpHandler handler)
{
w.RemapHandler (handler);
}
-#endif
public override void RewritePath (string path)
{
w.RewritePath (path);
@@ -212,11 +208,9 @@ namespace System.Web
{
w.RewritePath (filePath, pathInfo, queryString, setClientFilePath);
}
-#if NET_4_0
public override void SetSessionStateBehavior (SessionStateBehavior sessionStateBehavior)
{
w.SetSessionStateBehavior (sessionStateBehavior);
}
-#endif
}
}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs
index d542aa33447..bd8c126723d 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionBase.cs
@@ -39,9 +39,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpFileCollectionBase : NameObjectCollectionBase, ICollection, IEnumerable
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs
index 2ff06735fb7..4c7c919d1e4 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpFileCollectionWrapper.cs
@@ -40,9 +40,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpFileCollectionWrapper : HttpFileCollectionBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs
index 96b59dad4df..d5a783b8d09 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileBase.cs
@@ -38,9 +38,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpPostedFileBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs
index 5aea5a5663a..247b53866a8 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpPostedFileWrapper.cs
@@ -38,9 +38,7 @@ using System.Web.Caching;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpPostedFileWrapper : HttpPostedFileBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
index bf1d6f576aa..d71e791b879 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestBase.cs
@@ -40,16 +40,12 @@ using System.Security.Principal;
using System.Text;
using System.Web.Caching;
-#if NET_4_0
using System.Security.Authentication.ExtendedProtection;
using System.Web.Routing;
-#endif
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpRequestBase
@@ -94,11 +90,9 @@ namespace System.Web
public virtual string HttpMethod { get { NotImplemented (); return null; } }
public virtual Stream InputStream { get { NotImplemented (); return null; } }
-#if NET_4_0
// LAMESPEC: MSDN says NotImplementedException is thrown only when the request is
// not IIS7WorkerRequest or ISAPIWorkerRequestInProc, but it is thrown always.
public virtual ChannelBinding HttpChannelBinding { get { NotImplemented (); return null; } }
-#endif
public virtual bool IsAuthenticated { get { NotImplemented (); return false; } }
public virtual bool IsLocal { get { NotImplemented (); return false; } }
@@ -126,12 +120,10 @@ namespace System.Web
public virtual string RawUrl { get { NotImplemented (); return null; } }
public virtual string RequestType { get { NotImplemented (); return null; } set { NotImplemented (); } }
-#if NET_4_0
public virtual RequestContext RequestContext {
get { NotImplemented (); return null; }
internal set { NotImplemented (); }
}
-#endif
public virtual NameValueCollection ServerVariables { get { NotImplemented (); return null; } }
public virtual int TotalBytes { get { NotImplemented (); return 0; } }
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
index 197a7abd1c4..e861ce56169 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpRequestWrapper.cs
@@ -40,16 +40,12 @@ using System.Security.Principal;
using System.Text;
using System.Web.Caching;
-#if NET_4_0
using System.Security.Authentication.ExtendedProtection;
using System.Web.Routing;
-#endif
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpRequestWrapper : HttpRequestBase
@@ -133,11 +129,9 @@ namespace System.Web
public override string HttpMethod {
get { return w.HttpMethod; }
}
-#if NET_4_0
public override ChannelBinding HttpChannelBinding {
get { return w.HttpChannelBinding; }
}
-#endif
public override Stream InputStream {
get { return w.InputStream; }
}
@@ -194,12 +188,10 @@ namespace System.Web
get { return w.RequestType; }
set { w.RequestType = value; }
}
-#if NET_4_0
public override RequestContext RequestContext {
get { return w.RequestContext; }
internal set { w.RequestContext = value; }
}
-#endif
public override NameValueCollection ServerVariables {
get { return w.ServerVariables; }
}
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
index 2bf8ebd2f21..c83060493e3 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseBase.cs
@@ -41,15 +41,11 @@ using System.Text;
using System.Web.Caching;
using System.Threading;
-#if NET_4_0
using System.Web.Routing;
-#endif
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpResponseBase
@@ -254,7 +250,6 @@ namespace System.Web
{
NotImplemented ();
}
-#if NET_4_0
public virtual void RedirectPermanent (string url)
{
NotImplemented ();
@@ -319,7 +314,6 @@ namespace System.Web
{
NotImplemented ();
}
-#endif
public virtual void RemoveOutputCacheItem (string path)
{
NotImplemented ();
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
index adb5f74edd7..93789acbea6 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpResponseWrapper.cs
@@ -43,9 +43,7 @@ using System.Threading;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpResponseWrapper : HttpResponseBase
@@ -137,9 +135,7 @@ namespace System.Web
public override TextWriter Output {
get { return w.Output; }
-#if NET_4_0
set { w.Output = value; }
-#endif
}
public override Stream OutputStream {
@@ -302,7 +298,6 @@ namespace System.Web
{
w.Redirect (url, endResponse);
}
-#if NET_4_0
public override void RedirectPermanent (string url)
{
w.RedirectPermanent (url);
@@ -317,7 +312,6 @@ namespace System.Web
{
HttpResponse.RemoveOutputCacheItem (path, providerName);
}
-#endif
public override void RemoveOutputCacheItem (string path)
{
HttpResponse.RemoveOutputCacheItem (path);
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs
index 33cd857f8ff..a56c2c148aa 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityBase.cs
@@ -41,9 +41,7 @@ using System.Web.Profile;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpServerUtilityBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs
index 8fef0a47cff..52fc7a1981d 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpServerUtilityWrapper.cs
@@ -41,9 +41,7 @@ using System.Web.Profile;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpServerUtilityWrapper : HttpServerUtilityBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs
index 1c15c2f260b..61edd04b93a 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateBase.cs
@@ -41,9 +41,7 @@ using System.Web.SessionState;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpSessionStateBase : ICollection, IEnumerable
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs
index 149513512d1..563eb0ba09e 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpSessionStateWrapper.cs
@@ -41,9 +41,7 @@ using System.Web.SessionState;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpSessionStateWrapper : HttpSessionStateBase
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs
index 9f425977480..ee9b9c2a461 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionBase.cs
@@ -41,9 +41,7 @@ using System.Web.SessionState;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public abstract class HttpStaticObjectsCollectionBase : ICollection, IEnumerable
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs
index 504996807c0..4f33434663c 100644
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpStaticObjectsCollectionWrapper.cs
@@ -41,9 +41,7 @@ using System.Web.SessionState;
namespace System.Web
{
-#if NET_4_0
[TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-#endif
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class HttpStaticObjectsCollectionWrapper : HttpStaticObjectsCollectionBase