Merge pull request #48541 from dotnet/merges/release/dev16.7-to-release/dev16.7-vs-deps

Merge release/dev16.7 to release/dev16.7-vs-deps

azure-pipelines-integration.yml

@@ -18,7 +18,7 @@ jobs:
 - job: VS_Integration
   pool:
     name: NetCorePublic-Pool
-    queue: buildpool.windows.10.amd64.vs2019.pre.open
+    queue: buildpool.windows.10.amd64.vs2019.open
   strategy:
     maxParallel: 2
     matrix:

src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs

@@ -1145,7 +1145,14 @@ protected override void ApplyDocumentInfoChanged(DocumentId documentId, Document
                 }
 
                 // Must save the document first for things like Breakpoints to be preserved.
-                projectItemForDocument.Save();
+                // WORKAROUND: Check if the document needs to be saved before calling save. 
+                // Should remove the if below and just call save() once 
+                // https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1163405
+                // is fixed
+                if (!projectItemForDocument.Saved)
+                {
+                    projectItemForDocument.Save();
+                }
 
                 var uniqueName = projectItemForDocument.Collection
                     .GetUniqueNameIgnoringProjectItem(