Merge release/dev16.8 to release/dev16.9#48593
Merged
24 commits merged intorelease/dev16.9from Oct 16, 2020
Merged
Conversation
#47047 changed the logic for the file name and path we generate, but we were no longer ensuring the temporary directory existed prior to trying to create the file within it.
The compiler added a block to prevent loading generators that are built against the .NET Framework, since we know long term that we'll want them to be runnable on .NET Core. The IDE helper that deals with converting the error code to an IDE diagnostic needs to be updated to support this new error, or otherwise Visual Studio will crash. Fixes #47845
Update documentation for new minimum dependencies
…in SyntaxParser.Reset (#48393) * Ensure that tokens are refetched to the position in the reset point in SyntaxParser.Reset Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1179569. * Fix spacing * Change number for ERR_UnexpectedVarianceStaticMember
Get VS Color ThemeId without using dynamic
CI workarounds for 16.8 Preview 3
Avoid binding the world looking for target-typed new
Update PreRelease version for Preview 5
…f-source-generated-file Fix Go to Definition to a source-generated file
Handle disabled UndoManager during InlineRename
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉 p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
Member
…ng-incompatible-source-generator Don't crash if you reference a generator built against .NET Framework
…ease/dev16.8-to-release/dev16.9
69056d4 to
8746653
Compare
This pull request was closed.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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 release/dev16.8 into release/dev16.9.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout merges/release/dev16.8-to-release/dev16.9 git reset --hard upstream/release/dev16.9 git merge upstream/release/dev16.8 # Fix merge conflicts git commit git push upstream merges/release/dev16.8-to-release/dev16.9 --force