diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2020-01-21 11:43:30 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2020-01-21 11:43:30 +0300 |
| commit | 64bc04990ff95d05a56f6a83b962d3f2680763a3 (patch) | |
| tree | 678b61d7f582d6e120742e4efb6c5f46605907a0 | |
| parent | b31a29883f9013a84e4942632ab776f1b1a9d5cc (diff) | |
| parent | ccaa951307226dfa7e590d851752d3d12a38ecf9 (diff) | |
Merge remote-tracking branch 'origin/master' into release-8.5release-8.5
| -rw-r--r-- | main/src/addins/AspNet/Properties/AddinInfo.cs | 1 | ||||
| -rw-r--r-- | main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/main/src/addins/AspNet/Properties/AddinInfo.cs b/main/src/addins/AspNet/Properties/AddinInfo.cs index e7986424ec..657aba0e4a 100644 --- a/main/src/addins/AspNet/Properties/AddinInfo.cs +++ b/main/src/addins/AspNet/Properties/AddinInfo.cs @@ -15,3 +15,4 @@ using Mono.Addins; [assembly:AddinDependency ("Xml", MonoDevelop.BuildInfo.Version)] [assembly:AddinDependency ("SourceEditor2", MonoDevelop.BuildInfo.Version)] [assembly:AddinDependency ("TextTemplating", MonoDevelop.BuildInfo.Version)] +[assembly:AddinDependency ("TextEditor", MonoDevelop.BuildInfo.Version)]
\ No newline at end of file diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml index 1c6a951b10..ba8dadc295 100644 --- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml +++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml @@ -196,7 +196,11 @@ _label = "HTML Files"
extensions = "*.htm,*.html"/>
</Extension>
-
+
+ <Extension path="/MonoDevelop/TextEditor/LegacyEditorSupport">
+ <LegacyEditorSupport id="aspx" extensions=".aspx,.ashx,.asmx,.ascx,.master,.asax" />
+ </Extension>
+
<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
<ProjectFlavor
guid="{603C0E0B-DB56-11DC-BE95-000D561079B0}"
|