mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.Web/System.Web.UI/UserControlParser.cs
View File

@ -40,9 +40,7 @@ namespace System.Web.UI
internal class UserControlParser : TemplateControlParser
{
string masterPage;
#if NET_4_0
string providerName;
#endif
internal UserControlParser (VirtualPath virtualPath, string inputFile, HttpContext context)
: this (virtualPath, inputFile, context, null)
{
@ -139,7 +137,6 @@ namespace System.Web.UI
base.ProcessMainAttributes (atts);
}
#if NET_4_0
internal override void ProcessOutputCacheAttributes (IDictionary atts)
{
providerName = GetString (atts, "ProviderName", null);
@ -155,7 +152,6 @@ namespace System.Web.UI
return ret;
}
}
#endif
internal override string DefaultBaseTypeName {
get { return PagesConfig.UserControlBaseType; }
}
@ -167,11 +163,9 @@ namespace System.Web.UI
internal string MasterPageFile {
get { return masterPage; }
}
#if NET_4_0
internal string ProviderName {
get { return providerName; }
}
#endif
}
}