Merge master to release/fsharp5 #8667
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
* TcPat recovery: simple pats * TcPat recovery: report union case and active pattern items before checking args * TcPat recovery: type check attributes * TcPat recovery: literal patterns, union case named args * TcPat recovery: literal patterns, union case args * TcPat recovery: active patterns named args * TcPat recovery: union case 2 * TcPat recovery: update tests * TcPat recovery: different names/types in Or patterns * Move tests file to common place * Fix tupled union case args * Lost change * Fix test project file include * Review fix: use errorRecovery when catching exceptions * Minimize diff * Minimize diff * Update FCS project analysis test baselines * Merge fixes * Update test * Fix fsharpqa baselines * Another fsharpqa baselines update * Update desktop suite baselines * Update vsbsl
KevinRansom
approved these changes
Mar 6, 2020
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 master into release/fsharp5.
git fetch --all git checkout merges/master-to-release/fsharp5 git reset --hard upstream/release/fsharp5 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/fsharp5 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.