Merge pull request OmniSharp#1357 from SirIntruder/TryPromoteMiscFile…

…sFix Fix "Ambiguity" errors appearing when files are modified during project load
JulioJu · Dec 10, 2018 · 2881c46 · 2881c46
2 parents c7e225d + 79a8e82
commit 2881c46
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/OmniSharp.MSBuild/ProjectManager.cs b/src/OmniSharp.MSBuild/ProjectManager.cs
@@ -353,11 +353,11 @@ private void UpdateProject(string projectFilePath)
                 return;
             }
 
-            _workspace.TryPromoteMiscellaneousDocumentsToProject(project);
             UpdateSourceFiles(project, projectFileInfo.SourceFiles);
             UpdateParseOptions(project, projectFileInfo.LanguageVersion, projectFileInfo.PreprocessorSymbolNames, !string.IsNullOrWhiteSpace(projectFileInfo.DocumentationFile));
             UpdateProjectReferences(project, projectFileInfo.ProjectReferences);
             UpdateReferences(project, projectFileInfo.ProjectReferences, projectFileInfo.References);
+            _workspace.TryPromoteMiscellaneousDocumentsToProject(project);
         }
 
         private void UpdateSourceFiles(Project project, IList<string> sourceFiles)