Merge main to main-vs-deps #54230
Merged
Merge main to main-vs-deps #54230
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
…hout a cached result
…ith current implementation
… completion state matches
…ike a resultId we can pass between the client and server
…ed builds inside Visual Studio Work towards [AB#1337109](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1337109) For builds which are indirectly triggered inside Visual Studio from commands such as 'Run Tests' or 'Start Debugging', we implicitly skip analyzers to speed up these builds. Such builds will set a special property `IsIndirectlyTriggeredBuildInsideVisualStudio` to `true`, which guards the implicit skip analyzers logic. We display a special message to inform the users about us implicitly skipping analyzers to speed up the build. To enable MSBuild's incremental build logic and project system's fast-upto-date check logic to work correctly, we create/touch a special semaphore file to indicate the time stamp for last build with skipAnalyzers flag. This semaphore file is passed as a custom additional file input to builds without skipAnalyzers flag to ensure correct incremental builds. Additionally, we pass this file as an 'UpToDateCheckInput' item for project system's fast-upto-date check.
Ideally ImmutableSegmentedHashSet<string> would be used, but this type is not currently available. As an interim solution, ImmutableSegmentedDictionary<string, VoidResult> is used as a set. See https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1343268
Use segmented collection for faster declaration cache
Add functionality to enable skipping analyzers for implicitly trigger…
* Allow snippet format in XAML compeltion * change InsertSnippet to IsSnippet * fix formatting
Handle tokens with Kind == None in argument completion
Optimize calculation of remote supported languages
Initialize MEF services before switching to the main thread
Use isIncomplete flag to cap the LSP completion list size for faster serialization
… 20210618.1 (#54219) [main] Update dependencies from dotnet/source-build
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
|
⚠ This PR has merge conflicts. @RikkiGibson |
ghost
merged commit 
ghost
added this to the 
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 main into main-vs-deps.
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/main-to-main-vs-deps git reset --hard upstream/main-vs-deps git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-main-vs-deps --force