Upgrade to .NET 6

.config/dotnet-tools.json

@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "fake-cli": {
-      "version": "5.20.4",
+      "version": "6.0.0-beta001",
       "commands": [
         "fake"
       ]
     },
     "paket": {
-      "version": "6.0.0-rc006",
+      "version": "7.2.0",
       "commands": [
         "paket"
       ]
     },
     "dotnet-serve": {
-      "version": "1.7.120",
+      "version": "1.10.149",
       "commands": [
         "dotnet-serve"
       ]

.github/workflows/main.yml

@@ -15,19 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [5.0.404]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Setup .NET for main project build
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: ${{ matrix.dotnet }}
-    - name: Setup .NET for build tools
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
+      uses: actions/setup-dotnet@v3
     - name: Install local tools
       run: dotnet tool restore
     - name: Paket restore

build.fsx

@@ -1,13 +1,14 @@
 #r @"paket:
-nuget FSharp.Core 4.7.2
+frameworks: net6.0
+
+nuget FSharp.Core ~> 6
 nuget Fake.Core.Target
 nuget Fake.Core.ReleaseNotes
 nuget Fake.IO.FileSystem
-nuget Fake.DotNet.Cli
 nuget Fake.DotNet.AssemblyInfoFile
 nuget Fake.DotNet.Paket
 nuget Fake.Tools.Git
-nuget MsBuild.StructuredLogger >= 2.1.507 //"
+nuget MsBuild.StructuredLogger //"
 
 #if !FAKE
 #load "./.fake/build.fsx/intellisense.fsx"
@@ -26,7 +27,6 @@ open Fake
 open Fake.Core.TargetOperators
 open Fake.Core 
 open Fake.Tools.Git
-open Fake.DotNet
 open Fake.IO
 open Fake.IO.FileSystemOperators
 open Fake.IO.Globbing.Operators
@@ -111,8 +111,16 @@ Target.create "CleanDocs" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Build library & test project
 
+let dotnet arguments =
+    let result =
+        CreateProcess.fromRawCommandLine "dotnet" arguments
+        |> Proc.run
+
+    if result.ExitCode <> 0 then
+        failwithf "Failed to run \"dotnet %s\"" arguments
+
 Target.create "Build" (fun _ ->
-    for framework in ["netcoreapp3.1"] do
+    for framework in ["net6.0"] do
         [
             "src/FsLex.Core/fslexlex.fs"
             "src/FsLex.Core/fslexpars.fs"
@@ -123,12 +131,7 @@ Target.create "Build" (fun _ ->
         ] |> File.deleteAll
 
         for project in ["src/FsLex/fslex.fsproj"; "src/FsYacc/fsyacc.fsproj"] do
-            DotNet.publish (fun opts -> { 
-                opts with 
-                    Common = { opts.Common with CustomParams = Some "/v:n" }
-                    Configuration = DotNet.BuildConfiguration.Release
-                    Framework = Some framework 
-            }) project
+            dotnet $"publish {project} -c Release /v:n -f {framework}"
 
     [
         "tests/JsonLexAndYaccExample/Lexer.fs"
@@ -142,25 +145,19 @@ Target.create "Build" (fun _ ->
     for project in [ "src/FsLexYacc.Runtime/FsLexYacc.Runtime.fsproj"
                      "tests/JsonLexAndYaccExample/JsonLexAndYaccExample.fsproj"
                      "tests/LexAndYaccMiniProject/LexAndYaccMiniProject.fsproj" ] do
-        DotNet.build (fun opts -> { 
-            opts with 
-                Common = { opts.Common with CustomParams = Some "/v:n" }
-                Configuration = DotNet.BuildConfiguration.Release 
-        }) project
+        dotnet $"build {project} -c Release /v:n"
 )
 
 Target.create "RunTests" (fun _ ->
-    DotNet.test id "."
+    dotnet "test ."
 )
 
 // --------------------------------------------------------------------------------------
 // Run the unit tests using test runner
 
 Target.create "RunOldFsYaccTests" (fun _ ->
     let script = Path.Combine(__SOURCE_DIRECTORY__, "tests", "fsyacc", "OldFsYaccTests.fsx")
-    let result = DotNet.exec id "fake" ("run " + script)
-    if not result.OK then
-        failwith "Old FsLexYacc tests were failed"
+    dotnet $"fake run {script}"
 )
 
 // --------------------------------------------------------------------------------------