-
Notifications
You must be signed in to change notification settings - Fork 790
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge release/fsharp47 to release/dev16.3 #7223
Merged
KevinRansom
merged 269 commits into
release/dev16.3
from
merges/release/fsharp47-to-release/dev16.3
Jul 14, 2019
Merged
Merge release/fsharp47 to release/dev16.3 #7223
KevinRansom
merged 269 commits into
release/dev16.3
from
merges/release/fsharp47-to-release/dev16.3
Jul 14, 2019
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
This reverts commit a732de0.
…der to not loose its FSharpSymbolUse
# Conflicts: # src/fsharp/FSComp.txt
add a multiple arguments overloaded method group test
[RFC FS-1003] Nameof operator redux
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
Langversion for nameof feature
…equence and computation expressions) (#6806) * allow dropping yield in sequence expressions * update tests * update xlf * fix test * update baseline * implicit yield for computation expressions * fix tests, merge diag4 * fix test * update tests * fix tests * fix test * fix build * address PR * fix test * review feedback * make it match fsharp47
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
* open static classes feature * add missing change back * Update dependencies from https://github.com/dotnet/arcade build 20190704.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19354.2 * support struct tuple in leaf expression converter (#7144) * Update dependencies from https://github.com/dotnet/arcade build 20190705.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19355.2 * Update dependencies from https://github.com/dotnet/arcade build 20190706.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19356.1 * fix merge
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
* Langversion tests for ImplicitYield * tweak * Update single-test.fs removed some printfns * Feedback * One more cleanup * Uncore une fois * Update TypeChecker.fs Fix bug
…e/fsharp47 Merge release/dev16.3 to release/fsharp47
* Add langver support and tests for open static classes language feature * features flag * Feedback * neg tests do not yet work on coreclr
* Enable 4.7 by default * Label format
KevinRansom
approved these changes
Jul 14, 2019
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 release/fsharp47 into release/dev16.3.
git fetch --all git checkout merges/release/fsharp47-to-release/dev16.3 git reset --hard upstream/release/dev16.3 git merge upstream/release/fsharp47 # Fix merge conflicts git commit git push upstream merges/release/fsharp47-to-release/dev16.3 --force
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.