Skip to content

Conversation

@brettfo
Copy link
Member

@brettfo brettfo commented Feb 3, 2018

This is to hopefully fix the master to dev15.7 merges. Once this is done I'll finish the others.

dsyme and others added 2 commits January 29, 2018 19:30
* fix build.sh for OSX and a little cleanup

* fix build for mono packaging

* fix build for mono packaging

* disable some tests by default on OSX with build.sh test

* fix build from source IVTs
# Conflicts:
#	src/FSharpSource.Settings.targets
#	src/FSharpSource.targets
@brettfo
Copy link
Member Author

brettfo commented Feb 4, 2018

Hanging test is FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Control.AsyncType.CancellationPropagatesToGroupImmediate and can be run with:

.\packages\NUnit.Console.3.0.0\tools\nunit3-console.exe --work:release\net40\bin release\net40\bin\FSharp.Core.UnitTests.dll --test=FSharp.Core.UnitTests.FSharp_Core.Microsoft_FSharp_Control.AsyncType.CancellationPropagatesToGroupImmediate

Also hanging:
CancellationPropagatesToImmediateTask.

@dsyme
Copy link
Contributor

dsyme commented Feb 4, 2018

Is that test passing on master?

@brettfo
Copy link
Member Author

brettfo commented Feb 5, 2018

It doesn't exist in master, but it passes in current dev15.6 and passes in current dev15.7, just not with this PR applied, and I have no idea what the difference is. Test is here and was added in #2534.

@brettfo brettfo merged commit 6b07439 into dotnet:dev15.7 Feb 15, 2018
@brettfo brettfo deleted the merge-mono-fix-to-dev15.7 branch February 15, 2018 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants