Author: mhutch
Date: 2008-02-20 12:30:50 -0500 (Wed, 20 Feb 2008)
New Revision: 96278
Added:
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/ExpressionNode.cs
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/IAspNetLanguageBinding.cs
Removed:
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/CodeRenderNode.cs
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
trunk/monodevelop/main/src/addins/AspNetAddIn/ChangeLog
trunk/monodevelop/main/src/addins/AspNetAddIn/Makefile.am
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/RootNode.cs
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/Visitor.cs
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/AspNetFileDescriptionTemplate.cs
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/GlobalAsax-Empty.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehind.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehindNonPartial.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-Empty.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebConfig-Application.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehind.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehindNonPartial.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-Empty.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehind.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehindNonPartial.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-Empty.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-CodeBehind.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-Empty.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-CodeBehind.xft.xml
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-Empty.xft.xml
Log:
* Project/IAspNetLanguageBinding.cs,
Project/AspNetFileDescriptionTemplate.cs,
Templates/WebService-CodeBehind.xft.xml,
Templates/WebForm-CodeBehind.xft.xml,
Templates/MasterPage-Empty.xft.xml,
Templates/WebControl-CodeBehindNonPartial.xft.xml,
Templates/WebService-Empty.xft.xml,
Templates/WebHandler-CodeBehind.xft.xml,
Templates/WebForm-Empty.xft.xml,
Templates/WebControl-CodeBehind.xft.xml,
Templates/MasterPage-CodeBehindNonPartial.xft.xml,
Templates/WebConfig-Application.xft.xml,
Templates/WebHandler-Empty.xft.xml,
Templates/GlobalAsax-Empty.xft.xml,
Templates/WebControl-Empty.xft.xml,
Templates/MasterPage-CodeBehind.xft.xml,
Templates/WebForm-CodeBehindNonPartial.xft.xml: Add a mechanism for
having the ASP.NET language code be different from MD's internal
language codes, and use it to make VB.NET pages work OOTB.
* AspNetAddIn.mdp, Makefile.am: Updated.
* Parser/Tree/Visitor.cs, Parser/Tree/ExpressionNode.cs,
Parser/Tree/RootNode.cs: The way the parser's currently used, it
doesn't need to understand expressions, so rather than throwing a
NotImplementedException, just insert them into the AST and carry
on. Means that CodeBehind generation can be used for a much larger
subset of aspx pages.
Modified: trunk/monodevelop/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
2008-02-20 17:29:49 UTC (rev 96277)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/AspNetAddIn.mdp
2008-02-20 17:30:50 UTC (rev 96278)
@@ -36,7 +36,7 @@
<File name="Parser/Internal/TagType.cs" subtype="Code"
buildaction="Compile" />
<File name="Parser/Tree/DirectiveNode.cs" subtype="Code"
buildaction="Compile" />
<File name="Parser/Tree/RootNode.cs" subtype="Code" buildaction="Compile"
/>
- <File name="Parser/Tree/CodeRenderNode.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Parser/Tree/ExpressionNode.cs" subtype="Code"
buildaction="Compile" />
<File name="Parser/Tree/TagNode.cs" subtype="Code" buildaction="Compile" />
<File name="Parser/Tree/Node.cs" subtype="Code" buildaction="Compile" />
<File name="Parser/Tree/Visitor.cs" subtype="Code" buildaction="Compile" />
@@ -97,6 +97,7 @@
<File name="Project/WebTypeManager.cs" subtype="Code"
buildaction="Compile" />
<File name="Parser/DocumentReferenceManager.cs" subtype="Code"
buildaction="Compile" />
<File name="Parser/LocatedParserException.cs" subtype="Code"
buildaction="Compile" />
+ <File name="Project/IAspNetLanguageBinding.cs" subtype="Code"
buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Components" />
Modified: trunk/monodevelop/main/src/addins/AspNetAddIn/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/ChangeLog 2008-02-20
17:29:49 UTC (rev 96277)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/ChangeLog 2008-02-20
17:30:50 UTC (rev 96278)
@@ -1,3 +1,31 @@
+2008-02-20 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * Project/IAspNetLanguageBinding.cs,
+ Project/AspNetFileDescriptionTemplate.cs,
+ Templates/WebService-CodeBehind.xft.xml,
+ Templates/WebForm-CodeBehind.xft.xml,
+ Templates/MasterPage-Empty.xft.xml,
+ Templates/WebControl-CodeBehindNonPartial.xft.xml,
+ Templates/WebService-Empty.xft.xml,
+ Templates/WebHandler-CodeBehind.xft.xml,
+ Templates/WebForm-Empty.xft.xml,
+ Templates/WebControl-CodeBehind.xft.xml,
+ Templates/MasterPage-CodeBehindNonPartial.xft.xml,
+ Templates/WebConfig-Application.xft.xml,
+ Templates/WebHandler-Empty.xft.xml,
Templates/GlobalAsax-Empty.xft.xml,
+ Templates/WebControl-Empty.xft.xml,
+ Templates/MasterPage-CodeBehind.xft.xml,
+ Templates/WebForm-CodeBehindNonPartial.xft.xml: Add a mechanism for
+ having the ASP.NET language code be different from MD's internal
+ language codes, and use it to make VB.NET pages work OOTB.
+ * AspNetAddIn.mdp, Makefile.am: Updated.
+ * Parser/Tree/Visitor.cs, Parser/Tree/ExpressionNode.cs,
+ Parser/Tree/RootNode.cs: The way the parser's currently used, it
doesn't
+ need to understand expressions, so rather than throwing a
+ NotImplementedException, just insert them into the AST and carry on.
+ Means that CodeBehind generation can be used for a much larger subset
of
+ aspx pages.
+
2008-02-09 Mike Krüger <[EMAIL PROTECTED]>
* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am: Removed source
editor
Modified: trunk/monodevelop/main/src/addins/AspNetAddIn/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/Makefile.am 2008-02-20
17:29:49 UTC (rev 96277)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/Makefile.am 2008-02-20
17:30:50 UTC (rev 96278)
@@ -57,8 +57,8 @@
Parser/LocatedParserException.cs \
Parser/MemberListVisitor.cs \
Parser/PageInfoVisitor.cs \
- Parser/Tree/CodeRenderNode.cs \
Parser/Tree/DirectiveNode.cs \
+ Parser/Tree/ExpressionNode.cs \
Parser/Tree/ILocation.cs \
Parser/Tree/Node.cs \
Parser/Tree/ParentNode.cs \
@@ -78,6 +78,7 @@
Project/AspNetFileDescriptionTemplate.cs \
Project/AspNetMSBuildProjectExtension.cs \
Project/CodeBehind.cs \
+ Project/IAspNetLanguageBinding.cs \
Project/ProjectFolderNodeBuilderExtension.cs \
Project/VerifyCodeBehindBuildStep.cs \
Project/WebTypeManager.cs \
Deleted:
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/CodeRenderNode.cs
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/CodeRenderNode.cs
2008-02-20 17:29:49 UTC (rev 96277)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/CodeRenderNode.cs
2008-02-20 17:30:50 UTC (rev 96278)
@@ -1,45 +0,0 @@
-//
-// DirectiveNode.cs: Represents a code render expression in an ASP.NET
-// document tree
-//
-// Authors:
-// Michael Hutchinson <[EMAIL PROTECTED]>
-//
-// Copyright (C) 2006 Michael Hutchinson
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace AspNetAddIn.Parser.Tree
-{
-
- public class CodeRenderNode
- {
-
- public CodeRenderNode()
- {
- }
- }
-}
Copied:
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/ExpressionNode.cs
(from rev 95763,
trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/CodeRenderNode.cs)
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/CodeRenderNode.cs
2008-02-15 16:24:45 UTC (rev 95763)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/ExpressionNode.cs
2008-02-20 17:30:50 UTC (rev 96278)
@@ -0,0 +1,57 @@
+//
+// DirectiveNode.cs: Represents a code render expression in an ASP.NET
+// document tree
+//
+// Authors:
+// Michael Hutchinson <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2006 Michael Hutchinson
+//
+//
+// This source code is licenced under The MIT License:
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace AspNetAddIn.Parser.Tree
+{
+
+ public class ExpressionNode : Node
+ {
+ string expression;
+ public ExpressionNode (ILocation location, string expression)
+ : base (location)
+ {
+ this.expression = expression;
+ }
+
+ public string Expression {
+ get { return expression; }
+ }
+
+ public override void AcceptVisit (Visitor visitor)
+ {
+ visitor.Visit (this);
+ }
+
+ }
+}
Modified: trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/RootNode.cs
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/RootNode.cs
2008-02-20 17:29:49 UTC (rev 96277)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/RootNode.cs
2008-02-20 17:30:50 UTC (rev 96278)
@@ -81,44 +81,42 @@
{
switch (tagtype)
{
- case TagType.Close:
- if ( !(currentTagId != tagId))
- throw new ParseException
(location, "Closing tag does not match opening tag " + tagId + ".");
- currentNode = currentNode.Parent;
- break;
+ case TagType.Close:
+ if ( !(currentTagId != tagId))
+ throw new ParseException (location,
"Closing tag does not match opening tag " + tagId + ".");
+ currentNode = currentNode.Parent;
+ break;
- case TagType.CodeRender:
- throw new NotImplementedException
("Code render expressions have not yet been implemented: " +
location.PlainText);
-
- case TagType.CodeRenderExpression:
- throw new NotImplementedException
("Code render expressions have not yet been implemented: " +
location.PlainText);
-
- case TagType.DataBinding:
- throw new NotImplementedException("Data
binding expressions have not yet been implemented: " + location.PlainText);
-
- case TagType.Directive:
- AddtoCurrent (location, new
DirectiveNode (location, tagId, attributes));
- break;
+ case TagType.CodeRender:
+ case TagType.CodeRenderExpression:
+ case TagType.DataBinding:
+ AddtoCurrent (location, new ExpressionNode
(location, tagId));
+ break;
- case TagType.Include:
- throw new NotImplementedException
("Server-side includes have not yet been implemented: " + location.PlainText);
-
- case TagType.ServerComment:
-
- throw new NotImplementedException
("Server comments have not yet been implemented: " + location.PlainText);
+ case TagType.Directive:
+ AddtoCurrent (location, new DirectiveNode
(location, tagId, attributes));
+ break;
+
+ case TagType.Include:
+ throw new NotImplementedException ("Server-side
includes have not yet been implemented: " + location.PlainText);
+
+ case TagType.ServerComment:
+ //FIXME: the parser doesn't actually return
these
+ throw new NotImplementedException ("Server
comments have not yet been implemented: " + location.PlainText);
- case TagType.SelfClosing:
- AddtoCurrent (location, new TagNode
(location, tagId, attributes));
- break;
+ case TagType.SelfClosing:
+ AddtoCurrent (location, new TagNode (location,
tagId, attributes));
+ break;
- case TagType.Tag:
- Node child = new TagNode (location,
tagId, attributes);
- AddtoCurrent (location, child);
- currentNode = child;
- break;
+ case TagType.Tag:
+ Node child = new TagNode (location, tagId,
attributes);
+ AddtoCurrent (location, child);
+ currentNode = child;
+ break;
- case TagType.Text:
- throw new NotImplementedException("Text
tagtypes have not yet been implemented: " + location.PlainText);
+ case TagType.Text:
+ //FIXME: the parser doesn't actually return
these
+ throw new NotImplementedException("Text
tagtypes have not yet been implemented: " + location.PlainText);
}
}
Modified: trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/Visitor.cs
===================================================================
--- trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/Visitor.cs
2008-02-20 17:29:49 UTC (rev 96277)
+++ trunk/monodevelop/main/src/addins/AspNetAddIn/Parser/Tree/Visitor.cs
2008-02-20 17:30:50 UTC (rev 96278)
@@ -47,7 +47,7 @@
{
}
- public virtual void Visit (CodeRenderNode node)
+ public virtual void Visit (ExpressionNode node)
{
}
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/AspNetFileDescriptionTemplate.cs
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/AspNetFileDescriptionTemplate.cs
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/AspNetFileDescriptionTemplate.cs
2008-02-20 17:30:50 UTC (rev 96278)
@@ -42,6 +42,8 @@
using MonoDevelop.Projects;
using MonoDevelop.Projects.CodeGeneration;
+using MonoDevelop.AspNet;
+
namespace AspNetAddIn
{
@@ -98,6 +100,28 @@
{
tags ["Doctype"] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD
XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>";
+ //get a language binding
+ IDotNetLanguageBinding langbinding = null;
+ if (project == null) {
+ langbinding = (IDotNetLanguageBinding)
Services.Languages.GetBindingPerLanguageName (language);
+ } else {
+ DotNetProject dnp = (DotNetProject) project;
+ langbinding = dnp.LanguageBinding;
+ }
+
+ // work out the ASP.NET language code. Although it's
originally a hack around MD's VBNet language name
+ // not corresponding to any of the valid ASP.NET codes,
we also provide an interface that
+ // non-core language bindings can implement to
advertise that they support ASP.NET
+ string languageCode = language;
+ if (langbinding is IAspNetLanguageBinding) {
+ languageCode = ((IAspNetLanguageBinding)
langbinding).AspNetLanguageCode;
+ } else if (language == "VBNet") {
+ languageCode = "VB";
+ } else if (language != "C#") {
+ LoggingService.LogWarning ("The language
binding '{0}' does not have explicit support for ASP.NET");
+ }
+ tags ["AspNetLanguage"] = languageCode;
+
base.ModifyTags (project, language, identifier,
fileName, ref tags);
//nothing after this point is relevant to tag
substitution for filenames,
Added:
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/IAspNetLanguageBinding.cs
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/IAspNetLanguageBinding.cs
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Project/IAspNetLanguageBinding.cs
2008-02-20 17:30:50 UTC (rev 96278)
@@ -0,0 +1,40 @@
+//
+// IAspNetLanguage.cs
+//
+// Author:
+// Michael Hutchinson <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.AspNet
+{
+
+ public interface IAspNetLanguageBinding : IDotNetLanguageBinding
+ {
+ string AspNetLanguageCode { get; }
+ }
+}
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/GlobalAsax-Empty.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/GlobalAsax-Empty.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/GlobalAsax-Empty.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -22,7 +22,7 @@
<TemplateFiles>
<AspNetFile name="Global.asax" BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ Application Language="${Language}" %>
+<![CDATA[<%@ Application Language="${AspNetLanguage}" %>
<script runat="server">
${CodeRegion:script1}
</script>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehind.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehind.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -22,7 +22,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.master" BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Master Language="${Language}"
Inherits="${Namespace}.${Name}" %>
+ <![CDATA[<%@ Master
Language="${AspNetLanguage}" Inherits="${Namespace}.${Name}" %>
${Doctype}
<html>
<head>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehindNonPartial.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehindNonPartial.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-CodeBehindNonPartial.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -22,7 +22,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.master" BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Master Language="${Language}"
Inherits="${Namespace}.${Name}" %>
+ <![CDATA[<%@ Master
Language="${AspNetLanguage}" Inherits="${Namespace}.${Name}" %>
${Doctype}
<html>
<head>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-Empty.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-Empty.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/MasterPage-Empty.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -21,7 +21,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.master" BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Master Language="${Language}"%>
+ <![CDATA[<%@ Master
Language="${AspNetLanguage}"%>
${Doctype}
<html>
<head>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebConfig-Application.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebConfig-Application.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebConfig-Application.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -34,7 +34,7 @@
<configuration>
<system.web>
<compilation
- defaultLanguage="${Language}"
+ defaultLanguage="${AspNetLanguage}"
debug="true"
>
<assemblies>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehind.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehind.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -21,7 +21,7 @@
<TemplateFiles>
<AspNetFile DefaultExtension=".ascx" name="${Name}.ascx"
BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ Control Language="${Language}" Inherits="${Namespace}.${Name}"
%>]]>
+<![CDATA[<%@ Control Language="${AspNetLanguage}"
Inherits="${Namespace}.${Name}" %>]]>
</FileText>
</AspNetFile>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehindNonPartial.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehindNonPartial.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-CodeBehindNonPartial.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -21,7 +21,7 @@
<TemplateFiles>
<AspNetFile DefaultExtension=".ascx" name="${Name}.ascx"
BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ Control Language="${Language}" Inherits="${Namespace}.${Name}"
%>]]>
+<![CDATA[<%@ Control Language="${AspNetLanguage}"
Inherits="${Namespace}.${Name}" %>]]>
</FileText>
</AspNetFile>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-Empty.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-Empty.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebControl-Empty.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -17,7 +17,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.ascx" BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ Control Language="${Language}" ClassName="${Namespace}.${Name}" %>
+<![CDATA[<%@ Control Language="${AspNetLanguage}"
ClassName="${Namespace}.${Name}" %>
<script runat="server">
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehind.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehind.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -21,7 +21,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.aspx" DefaultExtension=".aspx"
BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Page Language="${Language}"
Inherits="${Namespace}.${Name}" %>
+ <![CDATA[<%@ Page Language="${AspNetLanguage}"
Inherits="${Namespace}.${Name}" %>
${Doctype}
<html>
<head>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehindNonPartial.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehindNonPartial.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-CodeBehindNonPartial.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -21,7 +21,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.aspx" DefaultExtension=".aspx"
BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Page Language="${Language}"
Inherits="${Namespace}.${Name}" %>
+ <![CDATA[<%@ Page Language="${AspNetLanguage}"
Inherits="${Namespace}.${Name}" %>
${Doctype}
<html>
<head>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-Empty.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-Empty.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebForm-Empty.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -17,7 +17,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.aspx" BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Page Language="${Language}" %>
+ <![CDATA[<%@ Page Language="${AspNetLanguage}"
%>
${Doctype}
<html>
<head>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-CodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-CodeBehind.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-CodeBehind.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -17,7 +17,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.ashx" BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ WebHandler Language="${Language}" Class="${Namespace}.${Name}"
%>]]>
+<![CDATA[<%@ WebHandler Language="${AspNetLanguage}"
Class="${Namespace}.${Name}" %>]]>
</FileText>
</AspNetFile>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-Empty.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-Empty.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebHandler-Empty.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -17,7 +17,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.ashx" BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ WebHandler Language="${Language}" Class="${Namespace}.${Name}" %>
+<![CDATA[<%@ WebHandler Language="${AspNetLanguage}"
Class="${Namespace}.${Name}" %>
${CodeRegion:script1}
]]> </FileText>
<CodeTranslationFile TagName="script1">
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-CodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-CodeBehind.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-CodeBehind.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -17,7 +17,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.asmx" BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ WebService Language="C#" Class="${Namespace}.${Name}" %>]]>
+<![CDATA[<%@ WebService Language="${AspNetLanguage}"
Class="${Namespace}.${Name}" %>]]>
</FileText>
</AspNetFile>
Modified:
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-Empty.xft.xml
===================================================================
---
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-Empty.xft.xml
2008-02-20 17:29:49 UTC (rev 96277)
+++
trunk/monodevelop/main/src/addins/AspNetAddIn/Templates/WebService-Empty.xft.xml
2008-02-20 17:30:50 UTC (rev 96278)
@@ -17,7 +17,7 @@
<TemplateFiles>
<AspNetFile name="${Name}.asmx" BuildAction="FileCopy">
<FileText>
-<![CDATA[<%@ WebService Language="C#" Class="${Namespace}.${Name}" %>
+<![CDATA[<%@ WebService Language="${AspNetLanguage}"
Class="${Namespace}.${Name}" %>
${CodeRegion:script1}
]]>
</FileText>
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
