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

8
mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
View File

@ -945,9 +945,7 @@ namespace System.Web.Compilation
case TagType.DataBinding:
case TagType.CodeRenderExpression:
case TagType.CodeRender:
#if NET_4_0
case TagType.CodeRenderEncode:
#endif
if (isApplication)
throw new ParseException (location, "Invalid content for application file.");
@ -1450,9 +1448,7 @@ namespace System.Web.Compilation
return CodeConstructType.ExpressionSnippet;
case TagType.CodeRender:
#if NET_4_0
case TagType.CodeRenderEncode:
#endif
return CodeConstructType.CodeSnippet;
case TagType.DataBinding:
@ -1485,10 +1481,8 @@ namespace System.Web.Compilation
b = new CodeRenderBuilder (code, true, location);
else if (tagtype == TagType.DataBinding)
b = new DataBindingBuilder (code, location);
#if NET_4_0
else if (tagtype == TagType.CodeRenderEncode)
b = new CodeRenderBuilder (code, true, location, true);
#endif
else
throw new HttpException ("Should never happen");
@ -1593,11 +1587,9 @@ namespace System.Web.Compilation
case TagType.CodeRenderExpression:
builder.AppendSubBuilder (new CodeRenderBuilder (tagid, true, location));
break;
#if NET_4_0
case TagType.CodeRenderEncode:
builder.AppendSubBuilder (new CodeRenderBuilder (tagid, true, location, true));
break;
#endif
case TagType.DataBinding:
builder.AppendSubBuilder (new DataBindingBuilder (tagid, location));
break;