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

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
using System.Text;
@@ -173,4 +172,3 @@ namespace MonoTests.System.Web.Caching
}
}
}
#endif

View File

@@ -54,9 +54,6 @@ namespace MonoCasTests.System.Web.Caching {
// note: CacheDependency still requires some file access
[FileIOPermission (SecurityAction.Assert, Unrestricted = true)]
#if ONLY_1_1
[SecurityPermission (SecurityAction.Assert, UnmanagedCode = true)]
#endif
private object FileIOPermissionCreateControl (SecurityAction action, AspNetHostingPermissionLevel level)
{
return CreateControlStringCtor (action, level);
@@ -69,13 +66,6 @@ namespace MonoCasTests.System.Web.Caching {
return FileIOPermissionCreateControl (action, level);
}
catch (TargetInvocationException tie) {
#if ONLY_1_1
// hide this error (occurs with ms 1.x)
if ((tie.InnerException is NullReferenceException) &&
(level == AspNetHostingPermissionLevel.Unrestricted)) {
return String.Empty;
}
#endif
throw tie;
}
}

View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Web;
using System.Web.Compilation;
@@ -58,4 +57,3 @@ namespace MonoTests.System.Web.Compilation
}
}
}
#endif

View File

@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
using System;
@@ -237,4 +236,3 @@ namespace MonoTests.System.Web.Compilation
}
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -55,4 +54,3 @@ namespace MonoTests.System.Web.Compilation {
}
#endif

View File

@@ -20,7 +20,6 @@ namespace MonoTests.System.Web.Compilation {
}
#if NET_2_0
public class BindTestDataItem
{
int data;
@@ -42,7 +41,6 @@ namespace MonoTests.System.Web.Compilation {
return new List <BindTestDataItem> {new BindTestDataItem (0), new BindTestDataItem (1)};
}
}
#endif
[TestFixture]
public class TemplateControlCompilerTest
@@ -62,7 +60,6 @@ namespace MonoTests.System.Web.Compilation {
WebTest.CopyResource (GetType (), "DuplicateControlsInClientComment.aspx", "DuplicateControlsInClientComment.aspx");
WebTest.CopyResource (GetType (), "TagsNestedInClientTag.aspx", "TagsNestedInClientTag.aspx");
WebTest.CopyResource (GetType (), "ConditionalClientComments.aspx", "ConditionalClientComments.aspx");
#if NET_2_0
WebTest.CopyResource (GetType (), "InvalidPropertyBind1.aspx", "InvalidPropertyBind1.aspx");
WebTest.CopyResource (GetType (), "InvalidPropertyBind2.aspx", "InvalidPropertyBind2.aspx");
WebTest.CopyResource (GetType (), "InvalidPropertyBind3.aspx", "InvalidPropertyBind3.aspx");
@@ -83,7 +80,6 @@ namespace MonoTests.System.Web.Compilation {
WebTest.CopyResource (GetType (), "NestedParserFileText.aspx", "NestedParserFileText.aspx");
WebTest.CopyResource (GetType (), "TagWithExpressionWithinAttribute.aspx", "TagWithExpressionWithinAttribute.aspx");
WebTest.CopyResource (GetType (), "EnumConverter_Bug578586.aspx", "EnumConverter_Bug578586.aspx");
#endif
}
[Test]
@@ -94,7 +90,6 @@ namespace MonoTests.System.Web.Compilation {
new WebTest ("ReadOnlyPropertyBind.aspx").Run ();
}
#if NET_2_0
// Test for bug #449970
[Test]
public void MasterPageContentPlaceHolderInTemplate ()
@@ -272,7 +267,6 @@ namespace MonoTests.System.Web.Compilation {
HtmlDiff.AssertAreEqual (originalHtml, renderedHtml, "#A1");
}
#endif
[Test (Description="Bug #323719")]
public void TagsNestedInClientTag ()
{

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -92,4 +91,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -70,4 +69,3 @@ namespace MonoTests.System.Web.Configuration {
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -69,4 +68,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -57,4 +56,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -106,4 +105,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -187,4 +186,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -54,4 +53,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -99,4 +98,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -88,4 +87,3 @@ namespace MonoTests.System.Web.Configuration {
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -71,4 +70,3 @@ namespace MonoTests.System.Web.Configuration {
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -53,4 +52,3 @@ namespace MonoTests.System.Web.Configuration {
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -74,4 +73,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -76,4 +75,3 @@ namespace MonoTests.System.Web.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@@ -71,4 +70,3 @@ namespace MonoTests.System.Web.Configuration {
}
}
#endif

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