Merge pull request #788 from SuaveIO/target-net-8

Target net 8.0

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.0",
+      "version": "8.0.3",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "6.0.0",
+      "version": "6.1.1",
       "commands": [
         "fake"
       ]

.github/workflows/build-suave.yml

@@ -21,6 +21,6 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.200
+        dotnet-version: 8.0.401
     - name: Build
       run: ./build.sh

build/build.fs

@@ -47,15 +47,15 @@ let initTargets () =
 
   Target.create "Tests" <| fun _ ->
     let path = "src" </> "Suave.Tests"
-    let res = DotNet.exec id "run" (sprintf "-c Release --framework net7.0 --project %s -- --summary --sequenced" path)
+    let res = DotNet.exec id "run" (sprintf "-c Release --framework net8.0 --project %s -- --summary --sequenced" path)
     if not res.OK then
       res.Errors |> Seq.iter (eprintfn "%s")
       failwith "Tests failed."
 
   // Requires `httperf` installed on the server (only linux atm)
   Target.create "Load" <| fun _ ->
     let path = "examples" </> "Pong"
-    let res = DotNet.exec id "run" (sprintf "-c Release --framework net7.0 --project %s" path)
+    let res = DotNet.exec id "run" (sprintf "-c Release --framework net8.0 --project %s" path)
     if not res.OK then
       res.Errors |> Seq.iter (eprintfn "%s")
       failwith "Tests failed."

examples/CORS/CORS.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>CORS</AssemblyName>
   </PropertyGroup>

examples/Example/Example.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>Example</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

examples/Fibonacci/Fibonacci.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>Fibonacci</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

examples/Load/Load.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>Load</AssemblyName>
   </PropertyGroup>

examples/Pong/Pong.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>Pong</AssemblyName>
   </PropertyGroup>

examples/Stream/Stream.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>Stream</AssemblyName>
   </PropertyGroup>

examples/WebSocket/WebSocket.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>WebSocket</AssemblyName>
   </PropertyGroup>

global.json

@@ -1 +1 @@
-{ "sdk": { "version": "7.0.200" } }
+{ "sdk": { "version": "8.0.401" } }

paket.dependencies

@@ -1,12 +1,13 @@
 version 5.249.0
 
 source https://api.nuget.org/v3/index.json
-framework net7.0
+framework net8.0
 storage none
 
 nuget FSharp.Core
 nuget Microsoft.Extensions.FileProviders.Embedded
 nuget System.IO.Pipelines
+nuget System.Text.Json
 nuget DotLiquid
 nuget Websocket.Client
 nuget FsCheck
@@ -16,7 +17,7 @@ nuget Expecto.BenchmarkDotNet
 
 group Examples
   source https://api.nuget.org/v3/index.json
-  framework net7.0
+  framework net8.0
   nuget FSharp.Core
   nuget Topshelf.FSharp
   nuget Topshelf
@@ -25,7 +26,7 @@ group Examples
 
 group Docs
   source https://api.nuget.org/v3/index.json
-  framework net7.0
+  framework net8.0
 
   nuget Argu
   nuget FSharp.Core

paket.lock

@@ -1,5 +1,5 @@
 STORAGE: NONE
-RESTRICTION: == net7.0
+RESTRICTION: == net8.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     BenchmarkDotNet (0.13.12)
@@ -80,6 +80,9 @@ NUGET
     System.Runtime.CompilerServices.Unsafe (6.0)
     System.Security.AccessControl (6.0.1)
     System.Security.Principal.Windows (5.0)
+    System.Text.Encodings.Web (8.0)
+    System.Text.Json (8.0.4)
+      System.Text.Encodings.Web (>= 8.0)
     System.Threading.Channels (8.0)
     Websocket.Client (5.1.2)
       Microsoft.Extensions.Logging.Abstractions (>= 8.0)
@@ -88,7 +91,7 @@ NUGET
       System.Threading.Channels (>= 8.0)
 
 GROUP Docs
-RESTRICTION: == net7.0
+RESTRICTION: == net8.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     Argu (6.2.4)
@@ -152,7 +155,7 @@ NUGET
       System.Text.Encodings.Web (>= 8.0)
 
 GROUP Examples
-RESTRICTION: == net7.0
+RESTRICTION: == net8.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FSharp.Core (8.0.400)

src/Suave.DotLiquid/Suave.DotLiquid.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>Suave.DotLiquid</AssemblyName>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

src/Suave.Experimental/Suave.Experimental.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>Suave.Experimental</AssemblyName>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

src/Suave.IO/Suave.IO.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>Suave.IO</AssemblyName>
     <OutputType>Exe</OutputType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Suave.Tests/Auth.fs

@@ -68,15 +68,9 @@ let interact methd resource container ctx =
   | true, values -> values |> Seq.iter (fun cookie -> container.SetCookies(endpointUri ctx.suaveConfig, cookie))
   response
 
-let sessionState f =
-  context( fun r ->
-    match HttpContext.state r with
-    | None ->  RequestErrors.BAD_REQUEST "damn it"
-    | Some store -> f store )
-
 [<Tests>]
 let authTests cfg =
-  let runWithConfig = runWith cfg //{ cfg with logger = Targets.create Warn [||] }
+  let runWithConfig = runWith cfg
   testList "auth tests" [
     testCase "baseline, no auth cookie" <| fun _ ->
       let ctx = runWithConfig (OK "ACK")
@@ -154,7 +148,18 @@ let authTests cfg =
 
         use res''''' = interact HttpMethod.GET "/protected"
         Expect.equal (contentString res''''') "please authenticate" "should not have access to protected after logout"
+        ]
 
+let sessionState f =
+  context(fun r ->
+    match HttpContext.state r with
+    | None ->  RequestErrors.BAD_REQUEST "damn it"
+    | Some store -> f store )
+
+[<Tests>]
+let sessionTests cfg =
+  let runWithConfig = runWith cfg 
+  testList "session tests" [
     testCase "test session is maintained across requests" <| fun _ ->
       // given
       let ctx =

src/Suave.Tests/Suave.Tests.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>Suave.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>

src/Suave/CookieSerialiser.fs

@@ -1,22 +1,15 @@
-namespace Suave
-
-open System.IO
+namespace Suave
 
 type CookieSerialiser =
   abstract serialise : Map<string, obj> -> byte []
   abstract deserialise : byte [] -> Map<string, obj>
 
-open System.Runtime.Serialization.Formatters.Binary
+open System.Text.Json
 
 type BinaryFormatterSerialiser() =
   interface CookieSerialiser with
     member x.serialise m =
-      use ms = new MemoryStream()
-      let f = new BinaryFormatter()
-      f.Serialize(ms, m)
-      ms.ToArray()
+      JsonSerializer.SerializeToUtf8Bytes<_>(m)
 
     member x.deserialise data =
-      use ms = new MemoryStream(data)
-      let f = new BinaryFormatter()
-      f.Deserialize ms :?> _
+      JsonSerializer.Deserialize<_>(data)

src/Suave/State.fs

@@ -2,6 +2,8 @@ module Suave.State
 
 open Suave.Cookie
 
+open System.Text.Json
+
 /// A session store is a reader and a writer function pair keyed on strings.
 type StateStore =
   /// Get an item from the state store
@@ -69,7 +71,6 @@ module CookieStateStore =
             let m =
                 try
                     ctx.runtime.cookieSerialiser.deserialise data
-
                 with _ ->
                     Map.empty
 
@@ -123,9 +124,10 @@ module CookieStateStore =
                 serialiser.deserialise (ss :?> byte [])
               with ex ->
                 Map.empty
+
             map
             |> Map.tryFind key
-            |> Option.map unbox
+            |> Option.map (fun z -> JsonSerializer.Deserialize(z :?> JsonElement))
           member x.set key value =
             let expiry = userState.[(StateStoreType + "-expiry")] :?> CookieLife
             write expiry key value
@@ -139,71 +141,3 @@ module CookieStateStore =
       match ctx.userState.TryGetValue StateStoreType with
       | true, x -> Some (createStateStore ctx.runtime.cookieSerialiser ctx.userState x)
       | _, _ -> None
-
-#if SYSTEM_RUNTIME_CACHING
-/// This module contains the implementation for the memory-cache backed session
-/// state store, when the memory cache is global for the server.
-module MemoryCacheStateStore =
-  open System
-  open System.Runtime.Caching
-  open System.Collections.Concurrent
-
-  /// This key will be present in HttpContext.userState and will contain the
-  /// MemoryCache instance.
-  [<Literal>]
-  let StateStoreType = "Suave.State.MemoryCacheStateStore"
-
-  [<Literal>]
-  let UserStateIdKey = "Suave.State.MemoryCacheStateStore-id"
-
-  [<Literal>]
-  let StateCookie = "mc-st"
-
-  module HttpContext =
-
-    /// Try to find the state id of the HttpContext.
-    let stateId ctx =
-      ctx.userState
-      |> Map.tryFind UserStateIdKey
-      |> Option.map (fun x -> x :?> string)
-      |> Option.get
-
-    /// Read the session store from the HttpContext.
-    let state (ctx : HttpContext) =
-      ctx.userState
-      |> Map.tryFind StateStoreType
-      |> Option.map (fun ss -> ss :?> StateStore)
-      |> Option.get
-
-  let private wrap (sessionMap : MemoryCache) relativeExpiry sessionId =
-    let exp = function
-      | Session   -> CacheItemPolicy()
-      | MaxAge ts -> CacheItemPolicy(SlidingExpiration = ts)
-
-    let stateBag =
-      lock sessionMap (fun _->
-        if sessionMap.Contains sessionId then
-          sessionMap.Get sessionId
-          :?> ConcurrentDictionary<string, obj>
-        else
-          let cd = new ConcurrentDictionary<string, obj>()
-          sessionMap.Set(CacheItem(sessionId, cd), exp relativeExpiry)
-          cd)
-
-    { new StateStore with
-        member x.get key =
-          if stateBag.ContainsKey key then
-            Some (stateBag.[key] :?> 'T)
-          else None
-        member x.set key value =
-          stateBag.[key] <- value
-          succeed }
-
-  let stateful relativeExpiry : WebPart =
-    let stateStore = wrap (MemoryCache.Default) relativeExpiry
-    context (fun ctx ->
-      let stateId = ctx |> HttpContext.stateId
-      Writers.setUserData StateStoreType (stateStore stateId))
-
-  let DefaultExpiry = TimeSpan.FromMinutes 30. |> MaxAge
-#endif

src/Suave/Suave.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>Suave</AssemblyName>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

src/Suave/paket.references

@@ -1,2 +1,3 @@
 FSharp.Core
 System.IO.Pipelines
+System.Text.Json