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

@ -47,9 +47,7 @@ namespace System.Web.UI
bool autoEventWireup = true;
bool enableViewState = true;
CompilationMode compilationMode = CompilationMode.Always;
#if NET_4_0
ClientIDMode? clientIDMode;
#endif
TextReader reader;
protected TemplateControlParser ()
@ -81,7 +79,6 @@ namespace System.Web.UI
}
atts.Remove ("TargetSchema"); // Ignored
#if NET_4_0
value = GetString (atts, "ClientIDMode", null);
if (!String.IsNullOrEmpty (value)) {
try {
@ -90,7 +87,6 @@ namespace System.Web.UI
ThrowParseException ("Invalid value of the ClientIDMode attribute.", ex);
}
}
#endif
base.ProcessMainAttributes (atts);
}
@ -209,11 +205,9 @@ namespace System.Web.UI
internal CompilationMode CompilationMode {
get { return compilationMode; }
}
#if NET_4_0
internal ClientIDMode? ClientIDMode {
get { return clientIDMode; }
}
#endif
internal override TextReader Reader {
get { return reader; }
set { reader = value; }