Merge main to lsp #16680
Merged
Merge main to lsp #16680
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
… Build ID 2366586 (#16625) * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2366586 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2366586 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2366586 * Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2366586
* Symbols: Add GenericArguments to FSharpEntity * Update surface area * Release notes * Keep type args in mfv.ApparentEnclosingEntity
* Add test for recursive call in list comprehension * Change the default to TailCall.No when checking the args of a Coerce * add release-notes entry * add PR number to release notes
#16594) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240125.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24075.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240125.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24075.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240125.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24075.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240125.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24075.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240129.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24079.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240130.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24080.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240130.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24080.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240201.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24101.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240201.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24101.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240201.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24101.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240201.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24101.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240205.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24073.1 -> To Version 9.0.0-alpha.1.24105.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vlad Zarytovskii <[email protected]>
* Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 * Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 * Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 * Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 * Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 * Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…se/dev17.9 Merge release/dev17.8 to release/dev17.9
* Don't add property symbol for CLIEvent member. * Add release notes
* Fix16431 - Modify DU static initialization #16661 * Update docs/release-notes/.FSharp.Compiler.Service/8.0.300.md Co-authored-by: Florian Verdonck <[email protected]> --------- Co-authored-by: Florian Verdonck <[email protected]> Co-authored-by: Petr <[email protected]>
* Parens needed for sequential exprs in interp strs * Handle more multiline parenthesization scenarios * Fmt * Expose `SyntaxNodes` API for internal use * Keep parens when removal would result in shadowing * Update release notes * Use `when` * Use better range * Consider spacing _after_ trimming --------- Co-authored-by: Adam Boniecki <[email protected]> Co-authored-by: Petr <[email protected]>
KevinRansom
approved these changes
Feb 9, 2024
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