Updates for .net 7 (#193)

* Updates for .net 7

* Fixing CI for 7

* inline because of fable design changes

* set yml to 2 space indent

* Update global.json

* Remove old dotnet versions

* Update global.json

* Run tests on 6/7, remove 5

Author: TheAngryByrd

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "6.2.1",
+      "version": "7.2.0-alpha001",
       "commands": [
         "paket"
       ]
     },
     "fable": {
-      "version": "3.7.1",
+      "version": "4.0.0-theta-015",
       "commands": [
         "fable"
       ]

.editorconfig

@@ -14,6 +14,9 @@ indent_size = 4
 trim_trailing_whitespace = true
 end_of_line = lf
 
+[*.yml]
+indent_size = 2
+
 [*.{fs,fsi,fsx,config}]
 # https://fsprojects.github.io/fantomas/docs/end-users/Configuration.html
 charset = utf-8

.github/workflows/build.yml

@@ -10,36 +10,23 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use .NET Core 2.1 SDK
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - name: Setup necessary dotnet SDKs
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '2.1.x'
-    - name: Use .NET Core 3.1 SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: Use .NET Core 5.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
-    # Not specifying a version will attempt to install via global.json
-    - name: Use .NET Core global.json
-      uses: actions/setup-dotnet@v1
-        
-    - name: Build
+        global-json-file: global.json
+        dotnet-version: |
+          6.x
+
+    - name: Build via Bash
       if: runner.os != 'Windows'
       run: |
-        chmod +x ./build.sh 
-        ./build.sh RunFableTests
+        chmod +x ./build.sh
+        ./build.sh
       env:
-        # Work around https://github.com/actions/setup-dotnet/issues/29
-        DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64
         CI: true
-    - name: Build
+    - name: Build via Windows
       if: runner.os == 'Windows'
-      run: ./build.cmd RunFableTests
+      run: ./build.cmd
       env:
-        # Work around https://github.com/actions/setup-dotnet/issues/29
-        DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64
-        CI: true
+        CI: true

README.md

@@ -39,8 +39,8 @@ GitHub Actions |
 #### Requirements
 
 * [.NET Core SDK](https://www.microsoft.com/net/download/)
-  * [v5.x](https://dotnet.microsoft.com/en-us/download/dotnet/5.0)
   * [v6.x](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+  * [v7.x](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
 * [Node](https://nodejs.org/en/)
   * v16.0.0 or LTS
   * Not required but recommend that you use [NVM](https://github.com/nvm-sh/nvm) to easily manage multiple versions of Node

benchmarks/benchmarks.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
@@ -30,4 +30,4 @@
     <ProjectReference Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

global.json

@@ -1,6 +1,5 @@
 {
-  "sdk": {
-    "version": "6.0.401",
-    "rollForward": "minor"
+    "sdk": {
+      "version": "7.0.100-rc.2.22477.23"
+    }
   }
-}

paket.dependencies

@@ -2,7 +2,7 @@ source https://api.nuget.org/v3/index.json
 
 
 storage: none
-framework: netstandard2.0, netstandard2.1, net5.0
+framework: netstandard2.0, netstandard2.1, net6.0, net7.0
 nuget FSharp.Core 4.7.2
 nuget Hopac
 nuget FSharp.Control.AsyncSeq 3.2.1
@@ -12,7 +12,8 @@ nuget Expecto
 nuget Expecto.Hopac
 nuget Microsoft.NET.Test.Sdk
 nuget YoloDev.Expecto.TestSdk
-nuget Fable.Mocha 2.10.0
+nuget Fable.Mocha
+nuget Fable.Core >= 4.0.0-theta-006
 
 
 group NetStandard2
@@ -25,30 +26,33 @@ nuget Expecto
 nuget Expecto.Hopac
 nuget Microsoft.NET.Test.Sdk
 nuget YoloDev.Expecto.TestSdk
-nuget Fable.Mocha 2.12.0
-framework: netstandard2.0, net5.0
+nuget Fable.Mocha
+nuget Fable.Core >= 4.0.0-theta-006
+framework: netstandard2.0, net6.0
 storage: none
 condition: netstandard2_0
 
 
 group NetStandard2_1
 source https://api.nuget.org/v3/index.json
-nuget FSharp.Core 6.0.3
+nuget FSharp.Core >= 7.0.0
 nuget Hopac
 nuget FSharp.Control.AsyncSeq
 nuget Expecto
 nuget Expecto.Hopac
 nuget Microsoft.NET.Test.Sdk
 nuget YoloDev.Expecto.TestSdk
-nuget Fable.Mocha 2.12.0
-nuget IcedTasks
+nuget Fable.Mocha
+nuget Fable.Core >= 4.0.0-theta-006
+nuget IcedTasks >= 0.3.0
+framework: netstandard2.1, net7.0
 storage: none
-condition: netstandard2_1
+condition: netstandard2_1, net7.0
 
 group Benchmarks
 source https://api.nuget.org/v3/index.json
 storage: none
-nuget FSharp.Core ~> 6
+nuget FSharp.Core ~> 7
 nuget BenchmarkDotNet 0.13.1
 nuget BenchmarkDotNet.Annotations 0.13.1
 nuget BenchmarkDotNet.Diagnostics.Windows 0.13.1
@@ -58,7 +62,7 @@ nuget BenchmarkDotNet.Diagnostics.Windows 0.13.1
 group Build
     source https://api.nuget.org/v3/index.json
     storage: none
-    nuget FSharp.Core 
+    nuget FSharp.Core
     nuget Fake.Core.Target 5.22.0
     nuget Fake.DotNet.Cli 5.22.0
     nuget Fake.Core.ReleaseNotes 5.22.0
@@ -70,4 +74,4 @@ group Build
     nuget Fake.Api.GitHub  5.22.0
     nuget Fake.BuildServer.GitHubActions 5.22.0
     nuget MSBuild.StructuredLogger
-    nuget Octokit
+    nuget Octokit