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

@ -42,9 +42,7 @@ namespace System.Web.UI
{
ScriptManager _scriptManager;
ScriptReferenceCollection _scripts;
#if NET_3_5
CompositeScriptReference _compositeScript;
#endif
ServiceReferenceCollection _services;
AuthenticationServiceManager _authenticationService;
ProfileServiceManager _profileService;
@ -84,7 +82,6 @@ namespace System.Web.UI
return _scripts;
}
}
#if NET_3_5
[PersistenceMode (PersistenceMode.InnerProperty)]
[Category ("Behavior")]
[DefaultValue (null)]
@ -97,7 +94,6 @@ namespace System.Web.UI
return _compositeScript;
}
}
#endif
[MergableProperty (false)]
[PersistenceMode (PersistenceMode.InnerProperty)]
[Category ("Behavior")]