Merge master to dev16.1 #6262
Merged
Merge master to dev16.1 #6262
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
* Fix Oddities in statically resolved method constraints and method overloading * no return type needed before proceeding to overload resolution * fix tests * unwind changes * revert to be cleanup only * revert to be cleanup only * revert to be cleanup only * revert to be cleanup only * adjsut test * test doesn't pass peverify * test doesn't pass peverify * apply code review
* Microsoft.FSharp.Comiler --> FSharp.Compiler * Microsoft.FSharp.Build --> FSharp.Build * fix small mistakes * fix build * fix flakey test (?)
* fix help text * fix flakey test (?) * update exename * use runsettings * same fix for FCS tests2 * fix build * add diagnostics * add diagnostics * fix final parallel case
As per #6226 this is required
Take ncaves fix + update xlf files.
* reformat huge lines * reformat most compiler options * fix flakey test (?) * use runsettings * same fix for FCS tests2 * more long lines * fix build * add diagnostics * fix final parallel case * try again to fix test * update test fixes
|
@brettfo There are conflicting files in this PR. Please have a look. |
* fix flakey test (?) * use runsettings * same fix for FCS tests2 * anonymous record support for expressions in FCS * anonymous record support for expressions in FCS * add tests for anonymous records and fix service testing with F# interactive * fix FCS docs * fix build * add diagnostics * update other baseline * fix final parallel case * try again to fix test * update test fixes
* Add coreclr test suite * tests for linux * No compiler on linux * feedback
* Lets see what breaks without sql client * Remove more
|
@brettfo There are conflicting files in this PR. Please have a look. |
brettfo
force-pushed
the
merges/master-to-dev16.1
branch
from
c2deb0a to
8a3cc20
Compare
ghost
merged commit
This pull request was closed.
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 dev16.1.
git fetch --all git checkout merges/master-to-dev16.1 git reset --hard upstream/dev16.1 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-dev16.1 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.