diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-18 09:59:14 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-18 09:59:14 +0400 |
| commit | a6e1400af37feff0af739bdf7f4fa788016cc7b3 (patch) | |
| tree | d6517af93b46326d3b680674e429fceb76697c09 /main/src/addins/AspNet | |
| parent | ad63357a0aa97c8b10f01ec3c1e54c54ec1f6f68 (diff) | |
| parent | a4954f61e72d18c33e4803e20105407830ad623d (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/MonoDevelop.MacDev/Makefile.am
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/TypeResolverVisitor.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
Diffstat (limited to 'main/src/addins/AspNet')
3 files changed, 22 insertions, 16 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml index 0b5513e44c..30678226fb 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml @@ -6,7 +6,7 @@ url = "http://monodevelop.com/" description = "Support for ASP.NET MVC projects." category = "Web Development" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import file = "Templates/Controller.xft.xml"/> @@ -23,12 +23,12 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="XmlEditor" version="2.8" /> - <Addin id="AspNet" version="2.8" /> - <Addin id="SourceEditor2" version="2.8" /> - <Addin id="TextTemplating" version="2.8" /> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="XmlEditor" version="2.8.1" /> + <Addin id="AspNet" version="2.8.1" /> + <Addin id="SourceEditor2" version="2.8.1" /> + <Addin id="TextTemplating" version="2.8.1" /> </Dependencies> <Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes"> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs index 7698aae1ab..4f02606d52 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs @@ -222,7 +222,10 @@ namespace MonoDevelop.AspNet.Gui var docLoc = Document.Editor.Document.OffsetToLocation (start); loc.EndLine = loc.BeginLine = docLoc.Line; loc.EndColumn = loc.BeginColumn = docLoc.Column; - + if (documentBuilder == null){ + localDocumentInfo = null; + return; + } localDocumentInfo = documentBuilder.BuildLocalDocument (documentInfo, Editor, sourceText, textAfterCaret, true); var viewContent = new MonoDevelop.Ide.Gui.HiddenTextEditorViewContent (); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml index 38be967d35..26b2aba5ce 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com/" description = "Support for ASP.NET projects, including editing, compiling, previewing and deploying to remote servers." category = "Web Development" - version = "2.8"> + version = "2.8.1"> <Runtime>
<Import file="Schemas/xhtml1-strict.xsd" />
@@ -15,12 +15,12 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="DesignerSupport" version="2.8"/> - <Addin id="Deployment" version="2.8"/> - <Addin id="XmlEditor" version="2.8" /> - <Addin id="SourceEditor2" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="DesignerSupport" version="2.8.1"/> + <Addin id="Deployment" version="2.8.1"/> + <Addin id="XmlEditor" version="2.8.1" /> + <Addin id="SourceEditor2" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes"> @@ -103,9 +103,12 @@ <Extension path = "/MonoDevelop/Ide/FileFilters"> <FileFilter id = "AspNetWebFiles" - insertbefore = "AllFiles" + insertafter = "Xml" _label = "ASP.NET Files" extensions = "*.aspx,*.ashx,*.asmx,*.ascx,*.master,*.asax" /> + <FileFilter id = "Html" + _label = "HTML Files" + extensions = "*.htm,*.html"/> </Extension> <Extension path = "/MonoDevelop/ProjectModel/ProjectBindings"> |