Merge main to lsp #16874
Merged
Merge main to lsp #16874
Conversation
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
* Allow access modifies to auto properties * move types * update release note * Put it under preview flag * add and update baseline * move checks leave parser * update ServiceNavigation; fantomas * add tests * fix tests * fix tests * fix tests * fix tests * fix * fix * fix * fix * add spaces * fix grammar --------- Co-authored-by: Vlad Zarytovskii <[email protected]>
Revert "Allow access modifiers to auto properties getters and setters (#16687)"
* Update dependencies from https://github.com/dotnet/arcade build 20240305.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24151.4 -> To Version 8.0.0-beta.24155.2 * Update dependencies from https://github.com/dotnet/arcade build 20240306.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24151.4 -> To Version 8.0.0-beta.24156.1 * Update dependencies from https://github.com/dotnet/arcade build 20240308.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24151.4 -> To Version 8.0.0-beta.24158.1 * Update dependencies from https://github.com/dotnet/arcade build 20240308.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24151.4 -> To Version 8.0.0-beta.24158.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <[email protected]>
* Completion: don't prevent getting items after record definition * Release notes * Fantomas * Add test --------- Co-authored-by: Vlad Zarytovskii <[email protected]>
* Parser: fix pattern range for idents with trivia * Release notes * Surface area --------- Co-authored-by: Petr <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]>
…311.1 (#16865) Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24158.4 -> To Version 8.0.0-beta.24161.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Kevin Ransom (msft) <[email protected]>
* Enforce AttributeTargets.Class and AttributeTargets.Struct * Enforce AttributeTargets.Class properly in the compiler * Enforce AttributeTargets.Class properly in the compiler * update tests * Fix test * release-notes * Extend AutoOpenAttribute and RequireQualifiedAccessAttribute to use AttributeTargets.Struct * Put back AutoOpen and RequireQualifiedAccess * Update tests * Release notes * release notes * Extend attributes targets * Update prim-types.fs * Update 8.0.300.md --------- Co-authored-by: Kevin Ransom (msft) <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: Petr <[email protected]>
dotnet-bot
force-pushed
the
merges/main-to-lsp
branch
from
8756b2a to
4f388c0
Compare
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 lsp.
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-lsp git reset --hard upstream/lsp git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-lsp --force