Merge pull request #52 from kirillgarbar/net5

BFS

Author: gsvgit

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "paket": {
-      "version": "6.0.13",
+      "version": "7.2.0",
       "commands": [
         "paket"
       ]

.devcontainer/install-dotnets.sh

@@ -15,7 +15,7 @@ fi
 # Add additional versions if required
 DOTNET_VERSIONS=(
     # 'latest'
-    '5.0.100'
+    '7.0.x'
 )
 for version in ${DOTNET_VERSIONS[@]}; do
    echo "installing dotnet $version"

benchmarks/GraphBLAS-sharp.Benchmarks/GraphBLAS-sharp.Benchmarks.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <Optimize>true</Optimize>

benchmarks/GraphBLAS-sharp.Benchmarks/paket.references

@@ -3,4 +3,3 @@ FSharp.Core
 BenchmarkDotNet
 MathNet.Numerics.FSharp
 MathNet.Numerics.MKL.Win-x64
-YC.QuickGraph

build/build.fs

@@ -350,7 +350,7 @@ let updateChangelog ctx =
     let linkReferenceForUnreleased = sprintf "[Unreleased]: %s/compare/%s...%s" gitHubRepoUrl (tagFromVersionNumber newVersion.AsString) "HEAD"
     let tailLines = File.read changelogFilename |> List.ofSeq |> List.rev
 
-    let isRef line = System.Text.RegularExpressions.Regex.IsMatch(line, @"^\[.+?\]:\s?[a-z]+://.*$")
+    let isRef (line:string) = System.Text.RegularExpressions.Regex.IsMatch(line, @"^\[.+?\]:\s?[a-z]+://.*$")
     let linkReferenceTargets =
         tailLines
         |> List.skipWhile String.isNullOrWhiteSpace

build/build.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

docsTool/WebServer.fs

@@ -28,7 +28,7 @@ module WebServer =
 
     /// Async version of IApplicationBuilder.Use
     let useAsync (middlware : HttpContext -> (unit -> Async<unit>) -> Async<unit>) (app:IApplicationBuilder) =
-        app.Use(fun env next ->
+        app.Use(fun env (next:Func<Threading.Tasks.Task>) ->
             middlware env (next.Invoke >> Async.AwaitTask)
             |> Async.StartAsTask
             :> System.Threading.Tasks.Task

docsTool/docsTool.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "5.0.x"
+        "version": "7.0.x"
     }
 }

paket.dependencies

@@ -1,27 +1,27 @@
 source https://www.nuget.org/api/v2
 source https://api.nuget.org/v3/index.json
 storage: none
-nuget FSharp.Core ~> 5.0
+nuget FSharp.Core ~> 7.0
 nuget Microsoft.SourceLink.GitHub 1.0.0 copy_local: true
 nuget Expecto 9.0.2
 nuget Expecto.FsCheck 9.0.2
-nuget YoloDev.Expecto.TestSdk 0.11.1
+nuget YoloDev.Expecto.TestSdk 0.13.3
 nuget Microsoft.NET.Test.Sdk 16.8.0
 nuget altcover ~> 7
 
-nuget System.Collections.Immutable 5.0
+nuget System.Collections.Immutable 7.0
 nuget ExtraConstraints.Fody 1.14.0
 nuget Microsoft.Build.Framework ~> 16.10
-nuget System.CodeDom >= 5.0
+nuget System.CodeDom >= 7.0
 nuget FSharp.Quotations.Evaluator 2.1.0
 nuget FSharpx.Collections 2.1.3
 nuget FSharpx.Text.StructuredFormat ~> 3.0.0
 nuget Brahma.FSharp >= 2.0.1
 nuget BenchmarkDotNet
-nuget MathNet.Numerics.FSharp
+nuget MathNet.Numerics.FSharp 4.0.0
 nuget MathNet.Numerics.MKL.Win-x64 2.5.0
 nuget TypeShape 9.0.0
-nuget YC.QuickGraph 3.7.4
+nuget QuikGraph 2.5.0
 
 // [ FAKE GROUP ]
 group Build
@@ -48,7 +48,7 @@ group Docs
     source https://api.nuget.org/v3/index.json
     nuget Argu
     nuget FSharp.Compiler.Service 34.1.0
-    nuget FSharp.Core ~> 4.6
+    nuget FSharp.Core ~> 7.0
     nuget Fake.IO.FileSystem 5.20.4
     nuget FAKE.Core.Environment 5.20.4
     nuget Fake.DotNet.Cli 5.20.4