Net 5.0 (#59)

.github/workflows/build-and-test.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.100
     - name: Setup dotnet manifest
       run: dotnet new tool-manifest
     - name: Setup paket

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.100
 
     - name: Setup dotnet manifest
       run: dotnet new tool-manifest
@@ -49,4 +49,3 @@ jobs:
         tag_name: ${{ github.ref }}
         release_name: Release ${{ github.ref }}
         draft: false
-        prerelease: true

.gitignore

@@ -17,3 +17,5 @@ extensions/Oryx.ThothJsonNet/obj
 paket-files/
 .idea
 .mypy_cache
+
+.metals/

benchmark/benchmark.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

paket.dependencies

@@ -5,7 +5,7 @@ group Main
     framework: netstandard2.0
 
     nuget Microsoft.Extensions.Logging
-    nuget FSharp.Core ~> 4.7
+    nuget FSharp.Core >= 4.7
     nuget Taskbuilder.fs ~> 2.1
 
 
@@ -14,48 +14,48 @@ group Json
     storage: none
 
     framework: netstandard2.0
-    nuget FSharp.Core ~> 4.7
+    nuget FSharp.Core >= 4.7
     nuget System.Text.Json
-    nuget Taskbuilder.fs ~> 2.1
+    nuget Taskbuilder.fs ~> 2
     nuget Oryx
 
 group Newtonsoft
     source https://www.nuget.org/api/v2
     storage: none
 
     framework: netstandard2.0
-    nuget FSharp.Core ~> 4.7
+    nuget FSharp.Core >= 4.7
     nuget Newtonsoft.Json
-    nuget Taskbuilder.fs ~> 2.1
+    nuget Taskbuilder.fs ~> 2
     nuget Oryx
 
 group Thoth
     source https://www.nuget.org/api/v2
     storage: none
 
     framework: netstandard2.0
-    nuget FSharp.Core ~> 4.7
+    nuget FSharp.Core >= 4.7
     nuget Thoth.Json.Net
-    nuget Taskbuilder.fs ~> 2.1
+    nuget Taskbuilder.fs ~> 2
     nuget Oryx
 
 group Google
     source https://www.nuget.org/api/v2
     storage: none
 
     framework: netstandard2.0
-    nuget FSharp.Core ~> 4.7
-    nuget Google.Protobuf ~> 3.9
-    nuget Taskbuilder.fs ~> 2.1
+    nuget FSharp.Core >= 4.7
+    nuget Google.Protobuf ~> 3
+    nuget Taskbuilder.fs ~> 2
     nuget Oryx
 
 group Test
     source https://www.nuget.org/api/v2
     storage: none
 
-    nuget FSharp.Core 4.7.0
+    nuget FSharp.Core >= 4.7
     nuget coverlet.msbuild 2.5.1
-    nuget Unquote ~> 4
+    nuget Unquote ~> 5
     nuget xunit ~> 2
     nuget xunit.runner.visualstudio ~> 2
     nuget Serilog.Sinks.XUnit
@@ -76,5 +76,5 @@ group Benchmark
 group Examples
     source https://www.nuget.org/api/v2
     storage: none
-    
+
     nuget Thoth.Json.Net

src/Handler.fs

@@ -41,11 +41,10 @@ module Handler =
     /// Run the HTTP handler in the given context.
     let runAsync (ctx : Context<'T>) (handler: HttpHandler<'T, 'TResult, 'TResult, 'TError>) : Task<Result<'TResult, HandlerError<'TError>>> =
         task {
-            let! result = handler finishEarly ctx
-            match result with
-            | Ok a -> return Ok a.Response
-            | Error err -> return Error err
+            let! result = (handler finishEarly) ctx
+            return Result.map (fun a -> a.Response) result
         }
+
     let map (mapper: 'T1 -> 'T2) (next : HttpFunc<'T2, 'TResult, 'TError>) (ctx : Context<'T1>) : HttpFuncResult<'TResult, 'TError> =
         next { Request = ctx.Request; Response = (mapper ctx.Response) }
 

src/Result.fs

@@ -17,4 +17,3 @@ module Result =
         let folder head tail = f head >>= (fun h -> tail >>= (fun t -> h::t |> rtn))
         List.foldBack folder ls (rtn List.empty)
     let sequenceList ls = traverseList id ls
-

test/Tests.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <GenerateProgramFile>false</GenerateProgramFile>