Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge pull request #46393 from ryzngard/issue/46192_nre_save_rename #48253

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Merge pull request #46393 from ryzngard/issue/46192_nre_save_rename #48253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
443817e
Merge pull request #46393 from ryzngard/issue/46192_nre_save_rename
Jul 29, 2020
75b30cb
Remove .pre for integration tests in 16.7
ryzngard Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@Cosifne Cosifne Oct 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the reason for changing this is because when the branch is created vs2019.pre is 16.7 and now vs2019 is 16.7?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. We do not want to merge any of this change back into master. 16.8 already has the right things for this. We do want to test this on 16.7, which is now the released version, and integration tests won't pass on 16.8

strategy:
maxParallel: 2
matrix:
Expand Down
9 changes: 8 additions & 1 deletion src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down