Merge master to features/source-generators #47492
Merged
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
* Remove IActiveStatementSpanTracker * ActiveStatementSpanProvider Co-authored-by: Tomas Matousek <tomat@microsoft.com>
Fix AnalyzerRunner
…ActionsSource.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
* Don't load generators that target net framework explicitly. * Do lookup based on TargetFrameworkAttribute rather than mscorlib reference * PR feedback: - Remove test resources and create generators on the fly - Reword some text * Build the compilation manually, rather than importing createCompilation
Cache semantic classifications and display from the cache while a solution is loading.
Merge release/dev16.8 to master
Clean up redundant code action filtering
Disable API analysis if telemetry is disabled
Make VerifyForwardedTypes asynchronous
* upstream/master: (220 commits) Don't load generators that target net framework explicitly. (#47100) Update src/Features/Core/Portable/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs Clean up redundant code action filtering Remove IActiveStatementSpanTracker (#46826) Disable API analysis if telemetry is disabled Update src/Workspaces/Remote/ServiceHub/Services/CodeAnalysis/CodeAnalysisService_SemanticClassificationCache.cs Doc Compress two values. PR feedback Revert Revert Lint Fix formatting Fire and forget Fix mangling Ensure that local functions are also marked as invalid if their containing methods are generic. Fix dependency graph for AnalyzerRunner Add AnalyzerRunner target for net5.0 Make VerifyForwardedTypes asynchronous Fix bug when "End statement" is used in single-line if (#47062) ...
Remove unnecessary initialize request to liveshare server from livesh…
…iagnostics description.
Fix CodeLens data point invalidation
Bail out early before getting SyntaxTree
http => https
Update remaining references to MyGet with Azure DevOps
Fixes #47214 Verified the issue repros prior to the fix and is resolved after this change.
* Add XAML LSP handlers for formatting and auto insert and update existing handlers to minimize breaking changes going forward. * TextDocument => DocumentId * Switch to object initializer
It fails in CI and it's not obvious why yet, so let's not hold up everything on that.
* Adjusted small nits * Fixed release-only baseline.
…elease/dev16.8-to-master
Use static lambdas to better express intent concisely
* Remove TODO from public documentation * Update SyntaxNode.cs * Update src/Compilers/Core/Portable/Syntax/SyntaxNode.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
Issue Errors on calls to UnmanagedCallersOnly-attributed methods
Devirtualize TokenMap
Merge release/dev16.8 to master
Fix and un-skip PropertySubPatternCompletionProviderTests and GenerateVariableTests
Serialize document states without loading text
|
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 (
|
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 master into features/source-generators.
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/source-generators git reset --hard upstream/features/source-generators git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/source-generators --force