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

@ -61,7 +61,6 @@ namespace System.Web.UI {
{
// this.sqlDependency = sqlDependency;
}
#if NET_4_0
public StaticPartialCachingControl (string ctrlID, string guid, int duration, string varyByParams,
string varyByControls, string varyByCustom, string sqlDependency,
BuildMethod buildMethod, string providerName)
@ -69,7 +68,6 @@ namespace System.Web.UI {
{
ProviderName = providerName;
}
#endif
[MonoTODO("Consider sqlDependency parameter")]
public static void BuildCachedControl (Control parent, string ctrlID, string guid,
int duration, string varyByParams, string varyByControls, string varyByCustom,
@ -88,7 +86,6 @@ namespace System.Web.UI {
{
BuildCachedControl (parent, ctrlID, guid, duration, varyByParams, varyByControls, varyByCustom, null, buildMethod);
}
#if NET_4_0
public static void BuildCachedControl (Control parent, string ctrlID, string guid, int duration,
string varyByParams, string varyByControls, string varyByCustom,
string sqlDependency, BuildMethod buildMethod, string providerName)
@ -98,7 +95,6 @@ namespace System.Web.UI {
if (parent != null)
parent.Controls.Add (ctl);
}
#endif
internal override Control CreateControl()
{
return buildMethod ();