Merge master to features/FileScopedNamespaces#51541
Merged
14 commits merged intofeatures/FileScopedNamespacesfrom Feb 28, 2021
Merged
Merge master to features/FileScopedNamespaces#5154114 commits merged intofeatures/FileScopedNamespacesfrom
14 commits merged intofeatures/FileScopedNamespacesfrom
Conversation
The code in here was removed in 5add689 and the project removed from Roslyn.sln, but some files were left around.
Avoid captures for AnyAsync
Use access token to do master validation
…atures.wpf Delete the src/EditorFeatures/CSharp.Wpf folder
Fix official build pipeline in dnceng
…se/dev16.10 Merge release/dev16.9 to release/dev16.10
(cherry picked from commit 336036ee4dc30484c54fd345314fd10d2e3d1f06)
Fixed two issues: - The way VB preporocessor symbols are encoded and decoded - Syntax files were using the on disk path which can have casing differences from the PDB path, flipped to PDB path
Merge release/dev16.10 to master
Rebuild MS.CA.VisualBasic
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
8 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 master into features/FileScopedNamespaces.
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/master-to-features/FileScopedNamespaces git reset --hard upstream/features/FileScopedNamespaces git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/FileScopedNamespaces --force