Merge master to dev16.1 #6340
Merged
Merge master to dev16.1 #6340
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
* process large expressions systematically * add test cases * update tests * Make .NET Desktop fsi.exe 32-bit again and make Desktop fsiAnyCpu.exe (64-bit) the default to launch in VS #6223 * make fsc.exe 32-bit for compat * make fsc.exe 32-bit for compat * fix build * fix build * ramp up max testing * correct optimization of linear matches * improve diagnostics * fix tests * tests only on .NET Framework for now * fix determinism
* cleanup commas * fix indentation * Update IlxGen.fs * apply formatting to additional files * improve output of script * improve output of script
* cleanup comments * cleanup primes
This addresses a situaltion where if you request a tooltip for an operator with a constraint no symbol is returned due to:
Item.ImplicitOp(_, { contents = Some(TraitConstraintSln.FSMethSln(_, vref, _)) })
Being turned into a vanilla FSharpSymbol which has no real information about the symbol that the IDE can use.
An corresponding issue was logged for ionide here: ionide/ionide-vscode-fsharp#1025
Corresponding PR at FCS: fsharp/fsharp-compiler-docs#896
* cleanup semicolons (ugh) * fix build * a little more cleanup * little bit more cleanup * little bit more cleanup * little bit more documentation * little bit more docs * whitespace cleanup and docs * more whitespace and code formatting * little bit more docs * add diagnostics * add diagnostics * add diagnostics * diagnostics * diagnostics * diagnostics * add diagnostics and possible fix for tp smoke tests * fix build * fix build
* Set compiler libraries to netstandard2.0" * Clean up #ifs * Standardize on NETSTANDARD * more
* add diagnostics * add diagnostics * diagnostics * diagnostics * diagnostics * add diagnostics and possible fix for tp smoke tests * fix build * fix build * more diagnostics * try to fix flaky test * fix build * try to fix dodgy test
|
@brettfo Check visualfsharp-CI failed. Please have a look. |
Contributor
|
Failure is |
Contributor
|
Looks like this should be ‘net472’. Also check for other occurrences https://github.com/Microsoft/visualfsharp/blob/dev16.1/src/fsharp/fsc/fsc.fsproj#L18 It’s ok here: https://github.com/Microsoft/visualfsharp/blob/dev16.1/src/fsharp/fsi/fsi.fsproj#L19 Perhaps we could find something less fragile here |
brettfo
force-pushed
the
merges/master-to-dev16.1
branch
from
381e539 to
6022cd4
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.