Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
@ -452,9 +452,7 @@ namespace MonoTests.System.Web.UI.WebControls
 				evaluateCount = 0;
 			}

-#if NET_4_0
 			internal
-#endif
 			protected override object Evaluate (HttpContext context, Control control) {
 				evaluateCount++;
 				return String.Format ("{0}{1}", DefaultValue, evaluateCount);