Merge master to features/source-generators #48298
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
Do not show unspeakable names in override completion
Wait for async operation to complete before disposing workspace
Report non-fatal errors for failed tasks
Merge release/dev16.8 to master
"Remove cast" cleanup
Add new feature to suggest using 'new(...)' in non-contentious scenarios
…ated`, giving us better future ability to add something like `InferredGenerated` if we want to expose a heuristic. * Added documentation comments.
…nvalid-language-versions Throw an exception if we can't parse language version
Co-authored-by: Jason Malinowski <jason@jason-m.com>
My simple implementation of GetUnmanagedCallersOnlyAttributeData in PEMethodSymbol would cause all PEMethodSymbols to load all attributes when the data is requested, unnecessarily increasing memory pressure. This refactors the implementation to only load the one attribute we need for it, and to not load the public-facing information that is unneeded for this. In the process, I refactored the method checks to share between regular SourceMethodSymbolWithAttributes and PEMethodSymbols, so the criteria for should be more consistent.
* Make UnmanagedCallersOnly decoding consistent with Obsolete * Remove IsValid tracking. This does mean that there are some otherwise bad UnmanagedCallersOnly attributes that we will no longer interpret as "bad" from metadata, but the effort in tracking this very niche scenario for slightly better errors is not worth the additional complexity. * More testing.
* Check field type when decoding UnmanagedCallersOnly. New tests for this have been added. * Small cleanup elements.
* Add incremental section * Add example warning
Merge release/dev16.8 to master
…y/ConvertAutoPropertyToFullPropertyTests.cs Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
CSharpConvertAutoPropertyToFullProperty... handles init accessor
Fix generic constraint handling in IDE0041
Handle checked and unchecked statements in formatting
Revert ISB services
This update brings in the fix for dotnet/Nerdbank.Streams#253.
This change reverts the changes made in 8e0cfa6, leaving the master branch in its current state.
Update Nerdbank.Streams to 2.6.81
Merge release/dev16.8 to master
Pass span to register refactorings in initialize parameter refactorin…
|
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