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

@ -62,9 +62,7 @@ namespace MonoCasTests.System.Web.Hosting {
[Test]
[AspNetHostingPermission (SecurityAction.Deny, Level = AspNetHostingPermissionLevel.Minimal)]
#if NET_2_0
[ExpectedException (typeof (SecurityException))]
#endif
public void Constructor_Deny_AspNetHostingPermission ()
{
new AppDomainFactory ();

View File

@ -169,11 +169,7 @@ namespace MonoTests.System.Web.Hosting {
//Assert.AreEqual (LoaderOptimization.NotSpecified, setup.LoaderOptimization);
p ("LoaderOptimization is: ", setup.LoaderOptimization);
Assert.AreEqual (0, string.Compare (
#if NET_2_0
String.Format ("{0}{1}bin", tb, Path.DirectorySeparatorChar),
#else
"bin",
#endif
setup.PrivateBinPath, true), "D9"
);
Assert.AreEqual (setup.PrivateBinPathProbe, "*", "D10");

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.Web.Hosting;
using NUnit.Framework;
@ -120,5 +119,4 @@ namespace MonoTests.System.Web.Hosting {
}
}
}
#endif

View File

@ -62,9 +62,7 @@ namespace MonoCasTests.System.Web.Hosting {
[Test]
[AspNetHostingPermission (SecurityAction.Deny, Level = AspNetHostingPermissionLevel.Minimal)]
#if NET_2_0
[ExpectedException (typeof (SecurityException))]
#endif
public void Constructor_Deny_AspNetHostingPermission ()
{
new ISAPIRuntime ();
@ -93,15 +91,9 @@ namespace MonoCasTests.System.Web.Hosting {
try {
isapi.ProcessRequest (IntPtr.Zero, 0);
}
#if NET_2_0
catch (AccessViolationException) {
// fx2.0
}
#else
catch (NullReferenceException) {
// fx1.x
}
#endif
catch (NotImplementedException) {
// mono
}
@ -111,34 +103,22 @@ namespace MonoCasTests.System.Web.Hosting {
catch (NotImplementedException) {
// mono
}
#if NET_2_0
try {
isapi.InitializeLifetimeService ();
}
catch (NotImplementedException) {
// mono
}
#endif
}
[Test]
[SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
#if NET_2_0
[ExpectedException (typeof (SecurityException))]
#endif
public void StopProcessing_Deny_UnmanagedCode ()
{
try {
isapi.StopProcessing ();
}
#if ONLY_1_1
catch (TypeInitializationException) {
// fx 1.x
}
catch (NotImplementedException) {
// mono
}
#endif
finally {
}
}
@ -150,11 +130,6 @@ namespace MonoCasTests.System.Web.Hosting {
try {
isapi.StopProcessing ();
}
#if ONLY_1_1
catch (TypeInitializationException) {
// fx 1.x
}
#endif
catch (NotImplementedException) {
// mono
}

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;
@ -180,5 +179,4 @@ namespace MonoTests.System.Web.Hosting {
}
}
#endif