Merge dev16.0.x to master #31003
Merged
Merge dev16.0.x to master #31003
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We previously didn't throw if a project system refused to give us a file path for the project file itself. In my refactoring, this accidentally switched over to a Marshal.ThrowExceptionForHR, which is now causing us to crash on at least Visual Studio Tools for Office projects. Put this back for now. Ultimately, after this "fix" we're back to the behavior described in dotnet/rosyn#30429: we won't crash, but we won't have a project file for the project.
…have-no-file-path Gracefully handle project systems not giving us a file path
Ensure PinnedRemotableDataScope is disposed
Fix the lifetime of IntegrationService
* Reorder PasteTrackingHandler so that FormatDocument does not dismiss it * Added PasteTracking test to check format on paste scenario * Documented why PasteTrackingPasteCommandHandler was ordered before FormatDocumnet.
|
@agocke Check roslyn-CI failed. Please have a look. |
|
This should be merging to dev16.0-preview2, not directly to master. |
ghost
merged commit
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from dev16.0.x into master.
git fetch --all git checkout merges/dev16.0.x-to-master git reset --hard upstream/master git merge upstream/dev16.0.x # Fix merge conflicts git commit git push merges/dev16.0.x-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.