Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -40,7 +40,6 @@ using System.Web.Security;
using System.Text.RegularExpressions;
using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using MonoTests.Common;
using NUnit.Framework;
using System.Collections.Specialized;
@ -879,7 +878,7 @@ namespace MonoTests.System.Web.UI.WebControls
using (var sw = new StringWriter ()) {
using (var w = new HtmlTextWriter (sw)) {
if (shouldFail)
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
cp.RenderControl (w);
}, message);
else {