Merge branch 'master' into newresolver

Conflicts:
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/AssemblyCodeCompletionDatabase.cs

5 files changed, 15 insertions, 23 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 3327c073de..e7f4fb81da 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.6">
+       version     = "2.7">
 	
 	<Runtime>
 		<Import file = "Templates/Controller.xft.xml"/>
@@ -23,12 +23,12 @@
 	</Runtime>
 	
 	<Dependencies>
-		<Addin id="Core" version="2.6"/>
-		<Addin id="Ide" version="2.6"/>
-		<Addin id="XmlEditor" version="2.6" />
-		<Addin id="AspNet" version="2.6" />
-		<Addin id="SourceEditor2" version="2.6" />
-		<Addin id="TextTemplating" version="2.6" />
+		<Addin id="Core" version="2.7"/>
+		<Addin id="Ide" version="2.7"/>
+		<Addin id="XmlEditor" version="2.7" />
+		<Addin id="AspNet" version="2.7" />
+		<Addin id="SourceEditor2" version="2.7" />
+		<Addin id="TextTemplating" version="2.7" />
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj
index 32a88b5b55..996a36bbde 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MonoDevelop.AspNet.Mvc</RootNamespace>
     <AssemblyName>MonoDevelop.AspNet.Mvc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
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 016d52bbb8..1670343fa0 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.6">
+       version     = "2.7">
 	
 	<Runtime>

 		<Import file="Schemas/xhtml1-strict.xsd" />

@@ -15,12 +15,12 @@
 	</Runtime>
 	
 	<Dependencies>
-		<Addin id="Core" version="2.6"/>
-		<Addin id="Ide" version="2.6"/>
-		<Addin id="DesignerSupport" version="2.6"/>
-		<Addin id="Deployment" version="2.6"/>
-		<Addin id="XmlEditor" version="2.6" />
-		<Addin id="SourceEditor2" version="2.6"/>
+		<Addin id="Core" version="2.7"/>
+		<Addin id="Ide" version="2.7"/>
+		<Addin id="DesignerSupport" version="2.7"/>
+		<Addin id="Deployment" version="2.7"/>
+		<Addin id="XmlEditor" version="2.7" />
+		<Addin id="SourceEditor2" version="2.7"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
index ffafa68b10..d6fbbe0527 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <AssemblyName>MonoDevelop.AspNet</AssemblyName>
     <RootNamespace>MonoDevelop.AspNet</RootNamespace>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
index aba8b7571b..aa1e14b11d 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
@@ -52,7 +52,7 @@ using MonoDevelop.Ide;
 namespace MonoDevelop.AspNet
 {
 	[DataInclude (typeof(AspNetAppProjectConfiguration))]
-	public class AspNetAppProject : DotNetProject
+	public class AspNetAppProject : DotNetAssemblyProject
 	{
 		[ItemProperty("XspParameters", IsExternal=true)]
 		protected XspParameters xspParameters = new XspParameters ();
@@ -129,12 +129,6 @@ namespace MonoDevelop.AspNet
 			}
 		}
 		
-		public override bool SupportsFramework (TargetFramework framework)
-		{
-			//only support 1.1, 2.0, 3.5, 4.0 etc, not monotouch, moonlight and so on
-			return framework.Id.Identifier == TargetFrameworkMoniker.ID_NET_FRAMEWORK && base.SupportsFramework (framework);
-		}
-		
 		#endregion
 		
 		#region constructors