Merge main to release/dev17.11 #17069
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
* Don't throw when getting tooltip in VS with no sln * Previously, if you opened Visual Studio with no solution and then opened an F# script file, tooltips would not work. This was because the quick info provider did not account for the possibility of a non-existent solution. This change updates the quick info provider so that it no longer tries to get the relative path of a solution that does not exist. * Update release notes
…stent (#17017) * Add tests for indexed setters with tuples * Wrap value expr in extra parens in 3 more cases * In the scenarios where assigning an unparenthesized tuple using an indexed setter already works, `MakeDelayedSet` is actually being called twice — once before `TcIndexingThen` is called, and once inside of it. For `SynExpr.NamedIndexedPropertySet`, `SynExpr.DotIndexedSet`, and, `SynExpr.DotNamedIndexedPropertySet`, we don't actually want to delay it; it just needs an extra set of parens (whether it should really need double parens is a different question). In this commit, I am simply adding the extra parens inline. I could alternatively have updated `MakeDelayedSet` itself to always wrap in double parens, although that would mean that in the codepaths where that function is itself already being called twice, we'd be adding extra parens parens unnecessarily. While extra parens do not affect typechecking (unlike insufficient parens), it seems undesirable to allocate more nodes than we really need, only to strip them later anyway. * Update release notes * Move release notes
* root embed -files * Release notes --------- Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
dotnet-bot
force-pushed
the
merges/main-to-release/dev17.11
branch
from
761cfd8 to
c968008
Compare
❗ Release notes required
Warning No PR link found in some release notes, please consider adding it.
|
T-Gro
approved these changes
Apr 19, 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 release/dev17.11.
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-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-release/dev17.11 --force