Merge main to release/dev17.10 #16919
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
…romScript (#16880) * Ensure script load closure is always executed for GetProjectSnapshotFromScript. * assumeDotNetFramework is false for non Windows. * Update Surface Area * Check for FF in test. * Address bad merge.
* Parser: more 'as' pattern recovery * Release notes --------- Co-authored-by: Petr <psfinaki@users.noreply.github.com>
…truct AttributeTargets.Interface incorrectly (#16891)
* Completion: fix for unfinished record field decl * Fantomas * Release notes
It's not useful for us since it doesn't cross azdo<->gh boundaries.
* Parser: more unfinished member recovery * Release notes * Update test baselines * Undo commit * Update test baselines * Revert --------- Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
* Fix receiving and processing mailbox after Dispose * Refactor * Refactoring * refactor * Add option to throw exception * Update 8.0.300.md * Update mailbox.fsi --------- Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com> Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* Update ParseFile in TransparentCompiler * Add unit tests * Decrease cache size
…ions (#16882) * Don't blow stack when traversing deep sequentials * Sequential expressions are more likely than most other expression kinds to be deeply nested, e.g., in very large list or array expressions. Since `traverseSynExpr` is not tail-recursive, we must treat them specially to avoid blowing the stack. * Update release notes * Only when actually nested * Update comments * Only alloc seq when needed * Add very big array test for AST traversal --------- Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24161.1 -> To Version 8.0.0-beta.24165.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Fix StackOverflow in non-recursive bindings checker * Release notes * Automated command ran: fantomas Co-authored-by: vzarytovskii <1260985+vzarytovskii@users.noreply.github.com> * Update src/Compiler/Checking/CheckDeclarations.fs Remove commented-out code --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ecee3f9 to
1be52aa
Compare
❗ Release notes required
Warning No PR link found in some release notes, please consider adding it.
|
vzarytovskii
approved these changes
Mar 21, 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.10.
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.10 git reset --hard upstream/release/dev17.10 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-release/dev17.10 --force