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 feature/witness-passing #9319

Merged

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into feature/witness-passing.

git fetch --all
git checkout merges/master-to-feature/witness-passing
git reset --hard upstream/feature/witness-passing
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-feature/witness-passing --force

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

Happypig375 and others added 2 commits May 28, 2020 01:09
* Add char to types resolvable by GenericZero

* Add char to get_Zero solving

* Add char to test

* Add char to test

* Add char to test again

* Fix naming
* ifEmptyUse fSharpCompilerLocation

In Wasm `Assembly.Location` do not have directory path since assemblies reside in memory.

* Check GetEnvironmentVariable("FSHARP_COMPILER_BIN") before tryAppConfig

In Wasm `tryAppConfig` throws and env var `FSHARP_COMPILER_BIN` never gets tested, so do it first

* ifEmptyUse with IsNullOrWhiteSpace
@KevinRansom KevinRansom merged commit 7f05686 into feature/witness-passing May 28, 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