upgrade upgrade upgrade

murocast · Mar 4, 2020 · a5cfc59 · a5cfc59
1 parent c5dba05
commit a5cfc59
Show file tree

Hide file tree

Showing 13 changed files with 1,526 additions and 1,691 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "fake-cli": {
+      "version": "5.19.1",
+      "commands": [
+        "fake"
+      ]
+    },
+    "paket": {
+      "version": "5.242.2",
+      "commands": [
+        "paket"
+      ]
+    }
+  }
+}
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/src/Server/bin/Debug/netcoreapp3.0/Server.dll",
+            "program": "${workspaceRoot}/src/Server/bin/Debug/netcoreapp3.1/Server.dll",
             "args": ["${workspaceRoot}/src/Client"],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
@@ -17,7 +17,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "Build Server",
-            "program": "${workspaceRoot}/src/Server/bin/Debug/netcoreapp3.0/Server.dll",
+            "program": "${workspaceRoot}/src/Server/bin/Debug/netcoreapp3.1/Server.dll",
             "args": ["${workspaceRoot}/src/Client", "AzureConnection=UseDevelopmentStorage=true" ],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
@@ -28,7 +28,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "Build ServerTests",
-            "program": "${workspaceRoot}/test/ServerTests/bin/Debug/netcoreapp3.0/ServerTests.dll",
+            "program": "${workspaceRoot}/test/ServerTests/bin/Debug/netcoreapp3.1/ServerTests.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "3.1.101"
+    }
+}
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,13 +1,13 @@
 group Server
     source https://api.nuget.org/v3/index.json
-    framework: netcoreapp3.0
+    framework: netcoreapp3.1
     storage: none
 
     nuget FSharp.Core
     nuget Saturn
     nuget Giraffe
+    nuget Thoth.Json.Net
     nuget Thoth.Json.Giraffe
-    nuget Fable.JsonConverter
 
     nuget FSharp.Data
 
@@ -17,14 +17,15 @@ group Server
     nuget Expecto.BenchmarkDotNet
     nuget Expecto.FsCheck
 
+    nuget LiteDB 4.1.4 //LiteDB 5 does not work right now
     nuget LiteDB.FSharp
 
     nuget CosmoStore
     nuget CosmoStore.LiteDB
 
 group Client
     source https://api.nuget.org/v3/index.json
-    framework: netstandard2.0
+    framework: netstandard2.1
     storage: none
 
     nuget Fable.Core ~> 3
@@ -37,6 +38,8 @@ group Client
     nuget Fulma ~> 2
     nuget Fable.FontAwesome.Free ~> 2
 
+    nuget Thoth.Json
+
 group Build
     source https://api.nuget.org/v3/index.json
     framework: netstandard2.0