Merge master to release/dev16.8 #9645
Merged
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
Added another property that is expected to fail, exhibiting inconsistencies in how the error is reported depending if the type is defined in F# or not.
…ions in the same type
Co-authored-by: Gauthier Segay <smoothdeveloper@users.noreply.github.com>
…e2.fs (#9516) (#9587) * Re-enabling tests from OperatorsModule1/2.fs (compile errors) * Fix compile errors in OperatorsModule1/2.fs, fix tests. Note tanh test comment. * Fix `tanh` test, ensure stable result on x86 vs x64 runtimes * Stop using exception AssertionException, so that test window shows useful info * Whitespace cleanup and redundant code removal * Cleanup spelling etc * Re-enabling int, int16, int32, int64, nativeint, incr, nullArg etc tests * Special-case floating-point assertion messages for higher precision output * Fix/update/add tests (some still failing) * Separate Checked tests, add & fix others, differentiate framework/bitness for some tests * Add branch for .NET Native (ignore cos test) * Resorting to comparing floats with a delta using Assert.AreNearEqual * Add some more tests Co-authored-by: Abel Braaksma <abel.online@xs4all.nl>
…e2.fs (#9516) (#9590) * Re-enabling tests from OperatorsModule1/2.fs (compile errors) * Fix compile errors in OperatorsModule1/2.fs, fix tests. Note tanh test comment. * Fix `tanh` test, ensure stable result on x86 vs x64 runtimes * Stop using exception AssertionException, so that test window shows useful info * Whitespace cleanup and redundant code removal * Cleanup spelling etc * Re-enabling int, int16, int32, int64, nativeint, incr, nullArg etc tests * Special-case floating-point assertion messages for higher precision output * Fix/update/add tests (some still failing) * Separate Checked tests, add & fix others, differentiate framework/bitness for some tests * Add branch for .NET Native (ignore cos test) * Resorting to comparing floats with a delta using Assert.AreNearEqual * Add some more tests Co-authored-by: Abel Braaksma <abel.online@xs4all.nl>
Merge master to release/dev16.7
* Migrated PreComputedTupleConstructor01.fs test case * Migrated PreComputedTupleConstructor02.fs test case * Migrated DU.fs and Record.fs test cases
…sharp into so-many-interfaces
…to NUnit (#9626) * Migrated DecimalLiterals01.fs test case * Migrated DecimalConstants02.fs test case * Migrated E_BasicConstantsBigNum01.fs test case * Migrated E_BasicConstantsBigNum40.fs test case * Removed unlisted test case * Migrated E_UnderscoreLiterals.fs test case * Migrated FullSetOfEscapeCharacters.fs test case * Migrated NegativeNumbers01.fs, NegativeNumbers02.fs, NegativeNumbers03.fs test cases
reset language version back to 4.7 for master branch
reset language version back to 4.7 for master branch
* fix 9565 * add comment
* cleanup fsi a bit * Update baselines
…sharp into so-many-interfaces
[FS-1031] Allow implementing the same interface at different generic instantiations in the same type
KevinRansom
approved these changes
Jul 8, 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/dev16.8.
git fetch --all git checkout merges/master-to-release/dev16.8 git reset --hard upstream/release/dev16.8 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/dev16.8 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.