Merge main to features/required-members#60797
Merged
dotnet-bot merged 231 commits intofeatures/required-membersfrom Apr 26, 2022
Merged
Merge main to features/required-members#60797dotnet-bot merged 231 commits intofeatures/required-membersfrom
dotnet-bot merged 231 commits intofeatures/required-membersfrom
Conversation
…dev17.3 Merge main-vs-deps to release/dev17.3
Update versions for preview4
* Update Typescript VS interface * Restore method signatures in completion provider * Move completion override to completion service with providers * Remove duplicate override Co-authored-by: Maria Solano <mariasolano@microsoft.com>
…ift operator. (#60616) https://github.com/dotnet/csharplang/blob/main/proposals/unsigned-right-shift-operator.md Add language version checks
…leinfo-files-to-generators Remove IDynamicFileInfo-added syntax trees to attempt to improve perf
…l-build Use VS2022 for official build
Nothing exciting here: when we are asked for diagnostics, we grab it off of the GeneratorDriver after running generators.
This is potentially going to make things slightly less efficient in that the loop across all projets may be calling GetProjectsThatTransitivelyDependOnThisProject multiple times; the first time will do the actual work and cache it, but we're spending the costs of extra lookups again. I don't think we had specific evidence for that optimization being critical, so I'm aiming for simpler code here.
…s-deps-to-release/dev17.0-vs-deps
…-to-release/dev17.0-vs-deps Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps
…to-release/dev17.1 Merge release/dev17.0-vs-deps to release/dev17.1
…se/dev17.2 Merge release/dev17.1 to release/dev17.2
Merge release/dev17.2 to main
Revert changes to PublishData.json from #60839
Add back deprecated packages to arcade publishing config.
Consolidate and simplify visibility checks in the tagger.
…urce It appears the existing contract when the language service is asked for a file that we don't know about is to return E_NOTIMPL: this assumption is encoded in other places like https://github.com/dotnet/project-system/blob/aca656810125ee6be02c47a5195ddde008fe1ae5/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/ProjectContextCodeModelProvider.cs#L70 In any case, we had a bug where if the caller asked about a file that happened to be an additional file, our check for the missing file would not return E_NOTIMPL and we'd throw other exceptions later. Fixes https://developercommunity.visualstudio.com/t/Adding-strings-to-resx-file-pops-a-modal/1511601
Optimize allocations in batch queue processing
Store incremental data in AVL tree instead of array
…n-for-additional-files Correctly return E_NOTIMPL when asked for file code models for non-source
* Allow VSMac to access LSP options * remove usings * Switch to full IVT for assembly as further options changes will require it
Merge release/dev17.3 to main
Remove non-servicing branches from our PublishData
OpenFileOnly Simplifier options defaults StreamJsonRpc bug workaround Make LineFormattingOptions class to avoid serialization issues
…ures/required-members * upstream/main: (156 commits) Pass fallback options (#60803) Rename `CodeStyleHostLanguageServices.cs.cs` to `CodeStyleHostLanguageServices.cs` (#60955) Allow VSMac to access LSP options (#60943) Add configs for 17.3 branch and update main version (#60942) Restore nugetKind config to publish data Remove unnecessary publish data config Remove non-servicing 15.x publish config Let 'arcade' packageFeeds imply all feeds are 'arcade' Remove non-servicing branches from our PublishData Handle unexpected keyword rather than identifier for lambda parameter name (#60825) Correctly return E_NOTIMPL when asked for file code models for non-source Move the resources to top (#60899) Add back deprecated packages to arcade publishing config. Simplify Rename parameter Simplify visibility logic in tagger Simplify visibility logic in tagger Try out some fixes Update StructConstructorTests.cs Use more descriptive variable name ...
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
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 features/required-members.
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 -t upstream/merges/main-to-features/required-members git reset --hard upstream/features/required-members git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/required-members --force