From d0e60420e80c927a3de7838e90a781d602802e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anz=CC=8Ce=20Vodovnik?= <anvod@microsoft.com>
Date: Thu, 16 Jan 2020 15:20:49 +0100
Subject: Switching the aspx file editing to the old editor.

This includes .aspx,.ashx,.asmx,.ascx,.master,.asax,.cshtml,.html,.htm.

Fixes VSTS https://vscmac.dev/1049891
---
 main/src/addins/AspNet/Properties/AddinInfo.cs                 | 1 +
 main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'main')

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..3a45530c4b 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,.cshtml,.html,.htm" />
+    </Extension>
+	
 	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
 		<ProjectFlavor
 			guid="{603C0E0B-DB56-11DC-BE95-000D561079B0}"
-- 
cgit v1.2.3


From 688072bb6c68274a45196192cde24d6aa7ea3e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anz=CC=8Ce=20Vodovnik?= <anvod@microsoft.com>
Date: Fri, 17 Jan 2020 16:27:51 +0100
Subject: Removing html files from the legacy support.

---
 main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main')

diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
index 3a45530c4b..0fb81d6869 100644
--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
@@ -198,7 +198,7 @@
 	</Extension>
 	
 	<Extension path="/MonoDevelop/TextEditor/LegacyEditorSupport">
-        <LegacyEditorSupport id="aspx" extensions=".aspx,.ashx,.asmx,.ascx,.master,.asax,.cshtml,.html,.htm" />
+        <LegacyEditorSupport id="aspx" extensions=".aspx,.ashx,.asmx,.ascx,.master,.asax" />
     </Extension>
 	
 	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
-- 
cgit v1.2.3