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

@ -35,9 +35,7 @@ namespace System.Web.Hosting {
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public sealed class AppDomainFactory : IAppDomainFactory {
#if NET_2_0
[AspNetHostingPermission (SecurityAction.Demand, Level = AspNetHostingPermissionLevel.Minimal)]
#endif
[SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
public AppDomainFactory ()
{

View File

@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
namespace System.Web.Hosting {
@ -48,5 +47,4 @@ namespace System.Web.Hosting {
}
}
#endif

View File

@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
namespace System.Web.Hosting {
@ -57,5 +56,4 @@ namespace System.Web.Hosting {
}
}
#endif

View File

@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections.Generic;
using System.IO;
@ -252,5 +251,4 @@ namespace System.Web.Hosting {
}
}
#endif

View File

@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
using System.Collections.Generic;
@ -137,5 +136,4 @@ namespace System.Web.Hosting {
}
}
#endif

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
@ -48,5 +47,4 @@ namespace System.Web.Hosting {
}
}
}
#endif

View File

@ -29,7 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Globalization;
@ -209,4 +208,3 @@ namespace System.Web.Hosting {
}
}
#endif

View File

@ -26,7 +26,6 @@
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
//
#if NET_2_0
using System.Runtime.InteropServices;
@ -43,4 +42,3 @@ namespace System.Web.Hosting
void Stop ();
}
}
#endif

View File

@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Security.Permissions;
using System.Web.Configuration;
@ -47,4 +46,3 @@ namespace System.Web.Hosting
void MessageReceived ();
}
}
#endif

View File

@ -29,7 +29,6 @@
using System;
using System.Runtime.InteropServices;
#if NET_2_0
namespace System.Web.Hosting
{
public interface IRegisteredObject
@ -37,4 +36,3 @@ namespace System.Web.Hosting
void Stop (bool immediate);
}
}
#endif

View File

@ -33,17 +33,9 @@ using System.Security.Permissions;
namespace System.Web.Hosting {
#if NET_2_0
public sealed class ISAPIRuntime : MarshalByRefObject, IISAPIRuntime, IRegisteredObject {
#else
// CAS - no InheritanceDemand here as the class is sealed
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public sealed class ISAPIRuntime : IISAPIRuntime {
#endif
#if NET_2_0
[AspNetHostingPermission (SecurityAction.Demand, Level = AspNetHostingPermissionLevel.Minimal)]
#endif
[SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
public ISAPIRuntime ()
{
@ -67,15 +59,12 @@ namespace System.Web.Hosting {
}
[MonoTODO ("Not implemented")]
#if NET_2_0
[SecurityPermission (SecurityAction.Demand, UnmanagedCode = true)]
#endif
public void StopProcessing ()
{
throw new NotImplementedException ();
}
#if NET_2_0
[MonoTODO ("Not implemented")]
public override object InitializeLifetimeService ()
{
@ -87,6 +76,5 @@ namespace System.Web.Hosting {
{
throw new NotImplementedException ();
}
#endif
}
}

View File

@ -127,11 +127,9 @@ namespace System.Web.Hosting {
return null;
}
}
#if NET_2_0
public override string RootWebConfigPath {
get { return WebConfigurationManager.OpenWebConfiguration ("~").FilePath; }
}
#endif
public override void EndOfRequest ()
{

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@ -53,5 +52,4 @@ namespace System.Web.Hosting {
}
}
}
#endif

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
@ -49,5 +48,4 @@ namespace System.Web.Hosting {
public abstract Stream Open ();
}
}
#endif

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Web;
@ -64,5 +63,4 @@ namespace System.Web.Hosting {
}
}
}
#endif

View File

@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
using System.IO;
@ -135,5 +134,4 @@ namespace System.Web.Hosting {
}
}
}
#endif