Merge branch 'master' into newresolver

Conflicts:
	main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/CSharpModifierToken.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IdentifierExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/MemberReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PointerReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Constraint.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/DelegateDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Identifier.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/MemberType.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/SimpleType.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/ForeachStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/GotoStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/TryCatchStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/FixedVariableInitializer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/MemberDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/VariableInitializer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/TypeSystemConvertVisitor.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/report.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/GenerateSwitchLabels.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/InsertAnonymousMethodSignature.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/RemoveBackingStore.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAttribute.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/ConstantValues.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Analysis/MinimalResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/NamedArgumentExpression.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/TypeReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Formatter/ITextEditorAdapter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/IOutputFormatter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/ParsedFile.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.jay
	main/contrib/ICSharpCode.NRefactory/CSharp/Refactoring/TypeSystemAstBuilder.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AliasNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AmbiguousResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ByReferenceResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ConstantResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/Conversions.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ErrorResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/IResolveVisitorNavigator.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ITypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/LocalResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MapTypeIntoNewContext.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberLookup.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberTypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MethodGroupResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NamespaceResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/SimpleTypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/TypeResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/Documentation/IDStringProvider.cs
	main/contrib/ICSharpCode.NRefactory/Documentation/XmlDocumentationProvider.cs
	main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
	main/contrib/ICSharpCode.NRefactory/Makefile.am
	main/contrib/ICSharpCode.NRefactory/PatternMatching/IPatternAstVisitor.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ArrayType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ByReferenceType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/DomRegion.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Error.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IAnnotatable.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IParsedFile.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ITypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompositeTypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompoundTypeDefinition.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeDefinition.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeParameter.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/ProxyTypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/TypeStorage.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ParameterizedType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/PointerType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/SharedTypes.cs
	main/contrib/ICSharpCode.NRefactory/Utils/DotNet35Compat.cs
	main/contrib/ICSharpCode.NRefactory/Utils/EmptyList.cs
	main/contrib/ICSharpCode.NRefactory/Utils/Platform.cs
	main/src/addins/CSharpBinding/CSharpBinding.csproj
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.ContextAction/MDRefactoringContext.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CreateMethod/CreateMethodCodeGenerator.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs
	main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.csproj
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectTypeInfo.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/Document.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDom.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/CodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DatabaseProjectDom.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilType.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
	main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AboutMonoDevelopTabPage.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/VersionInformationTabPage.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/AmbienceService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/CodeGenerator.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputFlags.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputSettings.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/ParsedDocument.cs
	main/tests/UnitTests/MonoDevelop.CSharpBinding/TopLevelTests.cs

11 files changed, 53 insertions, 52 deletions

diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs
index 4b9c3aa997..0324f4fb0f 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs
@@ -110,7 +110,7 @@ namespace MonoDevelop.AspNet.Mvc
 			//HACK: workaround for MD not local-copying package references
 			foreach (ProjectReference projectReference in References) {
 				if (projectReference.Package != null && projectReference.Package.Name == "system.web.mvc") {
-					if (projectReference.ReferenceType == ReferenceType.Gac)
+					if (projectReference.ReferenceType == ReferenceType.Package)
 						foreach (MonoDevelop.Core.Assemblies.SystemAssembly assem in projectReference.Package.Assemblies)
 							list.Add (assem.Location);
 					break;
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 e7f4fb81da..0b5513e44c 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.7">
+       version     = "2.8">
 	
 	<Runtime>
 		<Import file = "Templates/Controller.xft.xml"/>
@@ -23,12 +23,12 @@
 	</Runtime>
 	
 	<Dependencies>
-		<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" />
+		<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" />
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
index da46c5ce14..8a34f97c1f 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
@@ -25,16 +25,16 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetMvc">
 			<Options TargetFrameworkVersion = "3.5" />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Core" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Gac" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Gac" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
 			</References>
 			<Files>
 				<Directory name="Content" />
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
index a51024ad31..865fc08429 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
@@ -25,16 +25,16 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetMvc">
 			<Options TargetFrameworkVersion = "3.5" />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Core" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Gac" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Gac" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
 			</References>
 			<Files>
 				<Directory name="Content" />
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
index c796e100cf..a83c6fb294 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
@@ -282,7 +282,7 @@ namespace MonoDevelop.AspNet.Parser
 			MonoDevelop.Projects.ProjectReference pr;
 			if (string.IsNullOrEmpty (assemblyLocation)) {
 				pr = new MonoDevelop.Projects.ProjectReference
-					(MonoDevelop.Projects.ReferenceType.Gac, assemblyName);
+					(MonoDevelop.Projects.ReferenceType.Package, assemblyName);
 			} else {
 				pr =  new MonoDevelop.Projects.ProjectReference
 					(MonoDevelop.Projects.ReferenceType.Assembly, assemblyLocation);
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs
index 2dbf3b730f..abaa6e06c9 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs
@@ -50,15 +50,17 @@ namespace MonoDevelop.AspNet.StateEngine
 			: this (attributeState, nameState, new XmlMalformedTagState ()) {}
 		

 		public AspNetDirectiveState (XmlAttributeState attributeState, XmlNameState nameState,
-			XmlMalformedTagState malformedTagState)

+			XmlMalformedTagState malformedTagState)
 		{
 			this.AttributeState = attributeState;
 			this.NameState = nameState;
 			this.MalformedTagState = malformedTagState;
+			attributeState.AllowOpeningTagCharInsideAttributeValue = true;
 			
 			Adopt (this.AttributeState);
 			Adopt (this.NameState);
-			Adopt (this.MalformedTagState);

+			Adopt (this.MalformedTagState);
+			

 		}
 		
 		const int ENDING = 1;
@@ -96,23 +98,21 @@ namespace MonoDevelop.AspNet.StateEngine
 					} else {
 						directive.End (context.Location);
 						if (context.BuildTree) {
-							XContainer container = (XContainer) context.Nodes.Peek ();
+							XContainer container = (XContainer)context.Nodes.Peek ();
 							container.AddChildNode (directive);
 						}
 					}
 					return Parent;
 				}
 				//ending but not '>'? Error; go to end.
-			}
-			else if (char.IsLetter (c)) {
+			} else if (char.IsLetter (c)) {
 				rollback = string.Empty;
 				if (!directive.IsNamed) {
 					return NameState;
 				} else {
 					return AttributeState;
 				}
-			}
-			else if (char.IsWhiteSpace (c))
+			} else if (char.IsWhiteSpace (c))
 				return null;
 			
 			rollback = string.Empty;
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 1670343fa0..38be967d35 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.7">
+       version     = "2.8">
 	
 	<Runtime>

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

@@ -15,12 +15,12 @@
 	</Runtime>
 	
 	<Dependencies>
-		<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"/>
+		<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"/>
 	</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 6c03cbcc42..4538a8c96c 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj
@@ -80,6 +80,7 @@
     <ProjectReference Include="..\..\..\..\contrib\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\contrib\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
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 aa1e14b11d..6d1041e510 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
@@ -341,7 +341,7 @@ namespace MonoDevelop.AspNet
 			var dllName = parsed.Name + ".dll";
 			
 			foreach (var reference in References) {
-				if (reference.ReferenceType == ReferenceType.Gac || reference.ReferenceType == ReferenceType.Assembly) {
+				if (reference.ReferenceType == ReferenceType.Package || reference.ReferenceType == ReferenceType.Assembly) {
 					foreach (string refPath in reference.GetReferencedFileNames (null))
 						if (Path.GetFileName (refPath) == dllName)
 							return TypeSystemService.LoadAssemblyContext (TargetRuntime, refPath);
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
index 8e7db112d0..59e6bb0f3e 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
@@ -25,10 +25,10 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
 			<Options />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</References>
 			<Files>
 			</Files>
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
index 7173b05387..00668fc09a 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
@@ -26,10 +26,10 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
 			<Options />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</References>
 			<Files>
 				<FileTemplateReference TemplateID="GlobalAsax-CodeBehind" name="Global.asax" />