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

@ -30,7 +30,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Collections;
using System.Collections.Specialized;
using System.Text;
@ -407,11 +406,7 @@ namespace System.Web.UI.WebControls {
// returns the value of the control that it is bound to, while
// the QueryStringParameter object retrieves the current name/value pair from
// the HttpRequest object.
#if NET_4_0
protected internal
#else
protected
#endif
virtual object Evaluate (HttpContext context, Control control)
{
return null;
@ -460,5 +455,4 @@ namespace System.Web.UI.WebControls {
}
}
}
#endif