From 443817eef38c48edd8eabff016b4dfa2b8f20f93 Mon Sep 17 00:00:00 2001
From: "msftbot[bot]" <48340428+msftbot[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2020 22:13:13 +0000
Subject: [PATCH 1/2] Merge pull request #46393 from
 ryzngard/issue/46192_nre_save_rename

Check `Saved` on ProjectItem before calling Save
---
 .../ProjectSystem/VisualStudioWorkspaceImpl.cs           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
index 2687b3b81cf07..842d672cfdfdb 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
+++ b/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(

From 75b30cb85aafaa8860a596fcaac8b68dba758d44 Mon Sep 17 00:00:00 2001
From: "Andrew Hall (METAL)" <andrha@microsoft.com>
Date: Mon, 12 Oct 2020 10:27:09 -0700
Subject: [PATCH 2/2] Remove .pre for integration tests in 16.7

---
 azure-pipelines-integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
index 87a597c974b14..0881cab68895e 100644
--- a/azure-pipelines-integration.yml
+++ b/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: