Skip to content
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 master to release/dev16.8 #9763

Merged
merged 3 commits into from
Jul 24, 2020

Conversation

dotnet-bot
Copy link
Contributor

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 --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

kerams and others added 3 commits July 22, 2020 19:52
* [WIP] Simplified compiler API for testing

* [WIP] Support of references, for F#, C# projects. Added more asserts.

* Added more examples + ignoreWarnings support

* Added typecheck + baseline test helpers.

* Added running functionality

* Moved a bunch of compiler tests to a new suite

* Changed error message

* [WIP] Added CSharp compilation + referencing

* Added some simple interop tests

* [WIP] Process MetadataReference recursively

* [WIP] Added netcorapp31 support for tests

* [WIP] Termporary revert to using netcoreapp30 in the tests (instead of netcoreapp31)

* Added types to errors/warnings as oppose to just having tuples

* Fixed tests to fit newer API

* Revert libraries upgrade

* Revert change netcoreapp31 -> netcoreapp30

* Update tests/FSharp.Test.Utilities/Compiler.fs

Co-authored-by: Phillip Carter <pcarter@fastmail.com>

* Addressed some PR comments

* Fixed missing styling inconsistensies

* Addressed feedback: recursive module instead of forward type declarations + fixed options composition.

* Changed Option.isSome -> defaultArg

Co-authored-by: Phillip Carter <pcarter@fastmail.com>
* Refactor packagemanager lines

* fix add

* Fix merge issues

* feedback

Co-authored-by: Phillip Carter <pcarter@fastmail.com>
@KevinRansom KevinRansom merged commit 72f4620 into release/dev16.8 Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants