Fixes to WithDynamicDocuments()

Author: KirillOsenkov

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

@@ -141,7 +141,7 @@ public ProjectInfo UpdateDynamicFiles (ProjectInfo projectInfo, IEnumerable<stri
 					}
 				}
 
-				projectInfo = projectInfo.WithAdditionalDocuments(documents);
+				projectInfo = projectInfo.WithDocuments(projectInfo.Documents.Concat(documents));
 				return projectInfo;
 			}
 		}

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

@@ -1532,11 +1532,26 @@ void OnProjectModified (object sender, MonoDevelop.Projects.SolutionItemModified
 
 		internal ProjectInfo WithDynamicDocuments (MonoDevelop.Projects.Project project, ProjectInfo projectInfo)
 		{
+			var projectDirectory = Path.GetDirectoryName (project.FileName);
+
 			var contentItems = project.MSBuildProject.EvaluatedItems
 				.Where (item => item.Name == "Content" && item.Include.EndsWith (".razor", StringComparison.OrdinalIgnoreCase))
-				.Select (item => item.Include);
+				.Select (item => GetAbsolutePath(item.Include))
+				.ToList ();
 
 			return dynamicFileManager?.UpdateDynamicFiles (projectInfo, contentItems, this);
+
+			string GetAbsolutePath (string relativePath)
+			{
+				if (!Path.IsPathRooted (relativePath)) {
+					relativePath = Path.Combine (projectDirectory, relativePath);
+				}
+
+				// normalize the path separator characters in case they're mixed
+				relativePath = relativePath.Replace ('\\', Path.DirectorySeparatorChar);
+
+				return relativePath;
+			}
 		}
 
 		internal override void SetDocumentContext (DocumentId documentId)