Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -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

View File

@@ -8,17 +8,12 @@ LIB_MCS_FLAGS = \
/r:System.Core.dll \
/r:System.Web.dll
ifeq (2.0, $(FRAMEWORK_VERSION))
# This is a .NET 3.5 only assembly, but built during the 2.0 build
LIB_MCS_FLAGS += -d:NET_3_5
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES =
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.Web.Abstractions.dll
NO_INSTALL = yes

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
}
}

View File

@@ -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
@@ -183,17 +181,14 @@ 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)
{
w.RemapHandler (handler);
}
#endif
public override void RewritePath (string path)
{
w.RewritePath (path);
@@ -213,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
}
}

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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,19 +120,18 @@ 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; } }
#if NET_4_5
public virtual ReadEntityBodyMode ReadEntityBodyMode { get { NotImplemented(); return ReadEntityBodyMode.Classic; } }
#endif
public virtual UnvalidatedRequestValuesBase Unvalidated { get { NotImplemented (); return null; } }
public virtual Uri Url { get { NotImplemented (); return null; } }
public virtual Uri UrlReferrer { get { NotImplemented (); return null; } }
@@ -151,12 +144,10 @@ namespace System.Web
public virtual string [] UserLanguages { get { NotImplemented (); return null; } }
#if NET_4_5
public virtual void Abort ()
{
NotImplemented();
}
#endif
public virtual byte [] BinaryRead (int count)
{

View File

@@ -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; }
}
@@ -208,6 +200,14 @@ namespace System.Web
get { return w.TotalBytes; }
}
public override UnvalidatedRequestValuesBase Unvalidated {
get { return new UnvalidatedRequestValuesWrapper (w.Unvalidated); }
}
public override ReadEntityBodyMode ReadEntityBodyMode {
get { return ReadEntityBodyMode.Classic; }
}
public override Uri Url {
get { return w.Url; }
}
@@ -232,12 +232,10 @@ namespace System.Web
get { return w.UserLanguages; }
}
#if NET_4_5
public void Abort ()
{
w.WorkerRequest.CloseConnection();
}
#endif
public override byte [] BinaryRead (int count)
{

View File

@@ -39,16 +39,13 @@ using System.Security.Permissions;
using System.Security.Principal;
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
@@ -69,6 +66,8 @@ namespace System.Web
public virtual string Charset { get { NotImplemented (); return null; } set { NotImplemented (); } }
public virtual CancellationToken ClientDisconnectedToken { get { NotImplemented (); return CancellationToken.None; } }
public virtual Encoding ContentEncoding { get { NotImplemented (); return null; } set { NotImplemented (); } }
public virtual string ContentType { get { NotImplemented (); return null; } set { NotImplemented (); } }
@@ -105,9 +104,7 @@ namespace System.Web
public virtual bool SuppressContent { get { NotImplemented (); return false; } set { NotImplemented (); } }
#if NET_4_5
public virtual bool SuppressFormsAuthenticationRedirect { get { NotImplemented (); return false; } set { NotImplemented (); } }
#endif
public virtual bool TrySkipIisCustomErrors { get { NotImplemented (); return false; } set { NotImplemented (); } }
@@ -249,7 +246,6 @@ namespace System.Web
{
NotImplemented ();
}
#if NET_4_0
public virtual void RedirectPermanent (string url)
{
NotImplemented ();
@@ -314,7 +310,6 @@ namespace System.Web
{
NotImplemented ();
}
#endif
public virtual void RemoveOutputCacheItem (string path)
{
NotImplemented ();

View File

@@ -39,12 +39,11 @@ using System.Security.Permissions;
using System.Security.Principal;
using System.Text;
using System.Web.Caching;
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
@@ -82,6 +81,10 @@ namespace System.Web
set { w.Charset = value; }
}
public override CancellationToken ClientDisconnectedToken {
get { return CancellationToken.None; }
}
public override Encoding ContentEncoding {
get { return w.ContentEncoding; }
set { w.ContentEncoding = value; }
@@ -130,9 +133,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 {
@@ -169,12 +170,10 @@ namespace System.Web
set { w.SuppressContent = value; }
}
#if NET_4_5
public override bool SuppressFormsAuthenticationRedirect {
get { return w.SuppressFormsAuthenticationRedirect; }
set { w.SuppressFormsAuthenticationRedirect = value; }
}
#endif
public override bool TrySkipIisCustomErrors {
get { return w.TrySkipIisCustomErrors; }
@@ -295,7 +294,6 @@ namespace System.Web
{
w.Redirect (url, endResponse);
}
#if NET_4_0
public override void RedirectPermanent (string url)
{
w.RedirectPermanent (url);
@@ -310,7 +308,6 @@ namespace System.Web
{
HttpResponse.RemoveOutputCacheItem (path, providerName);
}
#endif
public override void RemoveOutputCacheItem (string path)
{
HttpResponse.RemoveOutputCacheItem (path);

View File

@@ -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

View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More