test fixes

src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/CollectionModulesConsistency.fs

@@ -1202,7 +1202,7 @@ let unfold<'a,'b when 'b : equality> f (start:'a) =
 let ``unfold is consistent`` () =
     smallerSizeCheck unfold<int,int>
 
-[<Test; Category("Expensive")>]
+[<Test; Category("Expensive"); Explicit>]
 let ``unfold is consistent full`` () =
     smallerSizeCheck unfold<int,int>
     smallerSizeCheck unfold<string,string>

src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncModule.fs

@@ -348,7 +348,7 @@ type AsyncModule() =
         for _i = 1 to 3 do test()
 
 
-    [<Test; Category("Expensive")>]
+    [<Test; Category("Expensive"); Explicit>]
     member this.``Async.AwaitWaitHandle does not leak memory`` () =
         // This test checks that AwaitWaitHandle does not leak continuations (described in #131),
         // We only test the worst case - when the AwaitWaitHandle is already set.
@@ -443,7 +443,7 @@ type AsyncModule() =
         testErrorAndCancelRace (Async.Sleep (-5))
 
 #if !(FSHARP_CORE_PORTABLE || FSHARP_CORE_NETCORE_PORTABLE || coreclr)
-    [<Test; Category("Expensive")>] // takes 3 minutes!
+    [<Test; Category("Expensive"); Explicit>] // takes 3 minutes!
     member this.``Async.Choice specification test``() =
         ThreadPool.SetMinThreads(100,100) |> ignore
         Check.One ({Config.QuickThrowOnFailure with EndSize = 20}, normalize >> runChoice)

src/fsharp/FSharp.Core.Unittests/project.json

@@ -6,23 +6,27 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "System.ValueTuple": "4.0.0-rc3-24212-01"
+    "System.ValueTuple": "4.0.0-rc3-24212-01",
+    "NUnitLite": "3.5.0",
+    "NUnit": "3.5.0",
+    "FsCheck": "2.6.2"
   },
   "runtimes": {
-    "win7-x86": { },
-    "win7-x64": { },
-    "osx.10.11-x64": { },
-    "ubuntu.14.04-x64": { }
+    "win7-x86": {},
+    "win7-x64": {},
+    "osx.10.11-x64": {},
+    "ubuntu.14.04-x64": {}
   },
   "frameworks": {
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
-        }
+        },
+        "Microsoft.NETCore.Portable.Compatibility": "1.0.1"
       },
-      "imports": "dnxcore50"
+      "imports": [ "netstandard1.6", "portable-net45+win8+wp8+wpa81" ]
     }
-  },
+  }
 }

tests/fsharp/FSharp.Tests.fsproj

@@ -74,12 +74,22 @@
       <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
       <Name>FSharp.Core</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net40'" >
     <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="nunit.framework">
       <HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'coreclr'" >
+    <Reference Include="nunit.framework, Version=$(NUnitFullVersion), Culture=neutral, PublicKeyToken=2638cd05610744eb" Condition="'$(TargetFramework)' != 'coreclr'">
+      <SpecificVersion>true</SpecificVersion>
+      <Private>True</Private>
+      <HintPath>$(NUnitLibDir)\nunit.framework.dll</HintPath>
+    </Reference>
   </ItemGroup>
 </Project>

tests/fsharp/core/tests_core.fs

@@ -929,7 +929,7 @@ let opsMutrec p = singleTestBuildAndRun p
 [<Test; FSharpSuiteScriptPermutations("core/nested")>]
 let nested p = singleTestBuildAndRun p
 
-[<Test; Category("Expensive"); FSharpSuiteTest("core/netcore/netcore259")>]
+[<Test; Category("Expensive"); Explicit; FSharpSuiteTest("core/netcore/netcore259")>]
 let ``Run all tests using PCL profie 259 FSHarp.Core``() = check (attempt {
     let cfg = FSharpTestSuite.testConfig ()
 
@@ -954,7 +954,7 @@ let ``Run all tests using PCL profie 259 FSHarp.Core``() = check (attempt {
     })
 
 
-[<Test; Category("Expensive"); FSharpSuiteTest("core/netcore/netcore7")>]
+[<Test; Category("Expensive"); Explicit; FSharpSuiteTest("core/netcore/netcore7")>]
 let ``Run all tests using PCL profie 7 FSHarp.Core`` () = check (attempt {
     let cfg = FSharpTestSuite.testConfig ()
 
@@ -978,7 +978,7 @@ let ``Run all tests using PCL profie 7 FSHarp.Core`` () = check (attempt {
 
     })
 
-[<Test; Category("Expensive"); FSharpSuiteTest("core/netcore/netcore78")>]
+[<Test; Category("Expensive"); Explicit; FSharpSuiteTest("core/netcore/netcore78")>]
 let ``Run all tests using PCL profie 78 FSHarp.Core``() = check (attempt {
     let cfg = FSharpTestSuite.testConfig ()
 
@@ -1002,7 +1002,7 @@ let ``Run all tests using PCL profie 78 FSHarp.Core``() = check (attempt {
 
     })
 
-[<Test; Category("Expensive"); FSharpSuiteTest("core/portable")>]
+[<Test; Category("Expensive"); Explicit; FSharpSuiteTest("core/portable")>]
 let ``Run all tests using PCL profie 47 FSHarp.Core`` () = check (attempt {
     let cfg = FSharpTestSuite.testConfig ()
 

tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/env.lst

@@ -1,2 +1,2 @@
 	SOURCE=SeqExpressionTailCalls01.fs SCFLAGS="-g --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd SeqExpressionTailCalls01.exe NetFx40"	# SeqExpressionTailCalls01.fs - NetFx40
-Expensive	SOURCE=SeqExpressionTailCalls02.fs SCFLAGS="-g --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd SeqExpressionTailCalls02.exe NetFx40"	# SeqExpressionTailCalls02.fs - NetFx40
+	SOURCE=SeqExpressionTailCalls02.fs SCFLAGS="-g --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd SeqExpressionTailCalls02.exe NetFx40"	# SeqExpressionTailCalls02.fs - NetFx40