Merge pull request #402 from baronfel/net5.0

Changes required to support a .net5.0 build of expecto.
haf · Nov 11, 2020 · 8fb043f · 8fb043f
2 parents 2733bea + e54e7e4
commit 8fb043f
Show file tree

Hide file tree

Showing 17 changed files with 926 additions and 1,228 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.245.1",
+      "version": "5.252.0",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.0",
+      "version": "5.20.4-alpha.1642",
       "commands": [
         "fake"
       ]

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: csharp
 dist: bionic
-dotnet: 3.1.300
+dotnet: 5.0.100
 
 matrix:
   fast_finish: true

diff --git a/Expecto.BenchmarkDotNet.Tests/Expecto.BenchmarkDotNet.Tests.fsproj b/Expecto.BenchmarkDotNet.Tests/Expecto.BenchmarkDotNet.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BenchmarkDotNetTests.fs" />

diff --git a/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj b/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Focused.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.fs" />

diff --git a/Expecto.Hopac.Tests/Expecto.Hopac.Tests.fsproj b/Expecto.Hopac.Tests/Expecto.Hopac.Tests.fsproj
@@ -4,7 +4,7 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AssemblyName>Expecto.Hopac.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Expecto.Hopac/Expecto.Hopac.fsproj b/Expecto.Hopac/Expecto.Hopac.fsproj
@@ -11,6 +11,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Expecto\Expecto.fsproj" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <Reference Include="System.Threading.Tasks" />
+  </ItemGroup>
   <Import Project="..\NuGet.props" />
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Expecto.Sample/Expecto.Sample.fsproj b/Expecto.Sample/Expecto.Sample.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Sample</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Expecto.Flip.Sample.fs" />

diff --git a/Expecto.Tests.CSharp/Expecto.Tests.CSharp.csproj b/Expecto.Tests.CSharp/Expecto.Tests.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Tests.CSharp</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Prelude.fs" />

diff --git a/Expecto/Expecto.Impl.fs b/Expecto/Expecto.Impl.fs
@@ -289,7 +289,7 @@ module Impl =
           let spirit =
             if summary.successful then "Success!" else String.Empty
           let commonAncestor =
-            let rec loop ancestor (descendants : string list) =
+            let rec loop (ancestor: string) (descendants : string list) =
               match descendants with
               | [] -> ancestor
               | hd::tl when hd.StartsWith(ancestor)->

diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ There's a nuget `Expecto.VisualStudio.TestAdapter` for Visual Studio integration
 
 You can use `dotnet run` or `dotnet watch` from the command line.
 
-    dotnet watch -p MyProject.Tests run -f netcoreapp3.1
+    dotnet watch -p MyProject.Tests run -f net5.0
 
 
 ### Prettify stacktraces/ship test logs
@@ -1122,8 +1122,8 @@ Tests.runTestsInAssemblyWithCLIArgs [Stress 0.1;Stress_Timeout 0.2] [||]
 From the command line you can run:
 
 ```
-dotnet run -p Expecto.Tests -f netcoreapp3.1 -c release -- --help
-dotnet watch -p Expecto.Tests run -f netcoreapp3.1 -c release -- --colours 256
+dotnet run -p Expecto.Tests -f net5.0 -c release -- --help
+dotnet watch -p Expecto.Tests run -f net5.0 -c release -- --colours 256
 ```
 
 ## Contributing and building 

diff --git a/build.fsx b/build.fsx
@@ -24,7 +24,7 @@ let configuration =
   |> DotNet.BuildConfiguration.fromString
 
 let release = ReleaseNotes.load "RELEASE_NOTES.md"
-let testFramework = "netcoreapp3.1"
+let testFramework = "net5.0"
 let dotnetExePath = "dotnet"
 
 let githubToken = lazy(Environment.environVarOrFail "GITHUB_TOKEN")

diff --git a/fake b/fake
@@ -4,4 +4,4 @@ set -eu
 set -o pipefail
 
 dotnet tool restore
-dotnet tool run fake $@
+dotnet fake $@
diff --git a/global.json b/global.json
@@ -1,6 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.3XX",
-        "rollForward": "latestFeature"
+        "version": "5.0.100"
     }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,5 +1,5 @@
 source https://api.nuget.org/v3/index.json
-framework net461, netstandard2.0, netcoreapp3.1
+framework net461, netstandard2.0, netcoreapp3.1, net5.0
 storage none
 version 5.245.1
 
@@ -13,20 +13,21 @@ nuget BenchmarkDotNet ~> 0.12.1
 group Build
   source https://api.nuget.org/v3/index.json
   storage none
-  framework auto-detect
+  framework netstandard2.0
 
   nuget FSharp.Core
   nuget Fake.Api.GitHub
   nuget Fake.BuildServer.AppVeyor
   nuget Fake.BuildServer.Travis
   nuget Fake.Core.ReleaseNotes
-  nuget Fake.Core.Target
-  nuget Fake.Core.Xml
-  nuget Fake.DotNet.Cli
-  nuget Fake.DotNet.Paket
-  nuget Fake.IO.FileSystem
+  nuget Fake.Core.Target prerelease
+  nuget Fake.Core.Xml prerelease
+  nuget Fake.DotNet.Cli prerelease
+  nuget Fake.DotNet.Paket prerelease
+  nuget Fake.IO.FileSystem prerelease
   nuget Fake.IO.Zip
   nuget Fake.Tools.Git
   nuget Fake.Tools.Octo
+  nuget Nuget.Protocol < 5.8
 
   github eiriktsarpalis/snippets SlnTools/SlnTools.fs