Add GetRealProject() proxy method

main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs

@@ -34,7 +34,7 @@
 
 namespace MonoDevelop.CSharp.Project
 {
-	class CSharpProject: DotNetProject, ICSharpProject
+	public class CSharpProject: DotNetProject, ICSharpProject
 	{
 		[ItemProperty ("StartupObject", DefaultValue = "")]
 		string mainclass = string.Empty;

main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProjectExtension.cs

@@ -47,11 +47,33 @@ internal protected override void InitializeChain (ChainedExtension next)
 
 		internal protected override bool SupportsObject (WorkspaceObject item)
 		{
-			return base.SupportsObject (item) && (item is DotNetProject);
+			if (base.SupportsObject (item)) {
+				if (item is DotNetProject) {
+					return true;
+				}
+
+				var project = item as Project;
+				if (project != null) {
+					return project.GetRealProject() is DotNetProject;
+				}
+			}
+
+			return false;
 		}
 
 		new public DotNetProject Project {
-			get { return (DotNetProject)base.Item; }
+			get {
+				if (base.Item is DotNetProject) {
+					return (DotNetProject)base.Item;
+				}
+
+				var project = base.Item as Project;
+				if (project.GetRealProject() is DotNetProject) {
+					return (DotNetProject)project.GetRealProject();
+				}
+
+				throw new InvalidOperationException();
+			}
 		}
 
 

main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs

@@ -211,6 +211,11 @@ public MSBuildProject MSBuildProject {
 			}
 		}
 
+		public virtual Project GetRealProject() {
+			// Normal MSBuild projects just use themselves for the type system and other extensions.
+			return this;
+		}
+
 		public List<string> DefaultImports {
 			get {
 				if (defaultImports == null) {

main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs

@@ -540,14 +540,6 @@ public string DefaultConfigurationId {
 			}
 		}
 
-		public ConfigurationSelector DefaultConfigurationSelector {
-			get {
-				if (defaultConfiguration == null && configurations.Count > 0)
-					DefaultConfigurationId = configurations [0].Id;
-				return new SolutionConfigurationSelector (DefaultConfigurationId);
-			}
-		}
-
 		IItemConfigurationCollection IConfigurationTarget.Configurations {
 			get {
 				return Configurations;

main/src/core/MonoDevelop.Core/MonoDevelop.Projects/SolutionConfigurationSelector.cs

@@ -51,6 +51,11 @@ public override ItemConfiguration GetConfiguration (IConfigurationTarget target)
 			if (target is SolutionItem) {
 				// Get the mapped configuration
 				SolutionItem item = (SolutionItem) target;
+				var project = item as Project;
+				if (project != null) {
+					item = project.GetRealProject();
+				}
+
 				if (item.ParentSolution != null) {
 					SolutionConfiguration config = item.ParentSolution.Configurations [Id];
 					if (config != null) {

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs

@@ -862,6 +862,7 @@ async void StartReparseThreadDelayed (FilePath currentParseFile)
 			CancelOldParsing ();
 			var token = parseTokenSource.Token;
 			var project = adhocProject ?? Project;
+			project = project.GetRealProject();
 			var projectFile = project?.GetProjectFile (currentParseFile);
 
 			ThreadPool.QueueUserWorkItem (delegate {

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs

@@ -103,7 +103,7 @@ protected override void Dispose (bool finalize)
 				IdeApp.Workspace.ActiveConfigurationChanged -= HandleActiveConfigurationChanged;
 			}
 			if (currentMonoDevelopSolution != null) {
-				foreach (var prj in currentMonoDevelopSolution.GetAllProjects ()) {
+				foreach (var prj in currentMonoDevelopSolution.GetAllProjects ().Select(x => x.GetRealProject())) {
 					UnloadMonoProject (prj);
 				}
 				currentMonoDevelopSolution = null;
@@ -189,7 +189,7 @@ static bool SupportsRoslyn (MonoDevelop.Projects.Project proj)
 		async Task<SolutionInfo> CreateSolutionInfo (MonoDevelop.Projects.Solution solution, CancellationToken token)
 		{
 			var projects = new ConcurrentBag<ProjectInfo> ();
-			var mdProjects = solution.GetAllProjects ();
+			var mdProjects = solution.GetAllProjects ().Select(x => x.GetRealProject()).ToList();
 			projectionList.Clear ();
 			solutionData = new SolutionData ();
 

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs

@@ -248,6 +248,8 @@ public static IEnumerable<DocumentId> GetDocuments (string fileName)
 
 		public static Microsoft.CodeAnalysis.Project GetCodeAnalysisProject (MonoDevelop.Projects.Project project)
 		{
+			project = project.GetRealProject();
+
 			if (project == null)
 				throw new ArgumentNullException ("project");
 			foreach (var w in workspaces) {