net8 tfm (#38)

TheAngryByrd · Jan 28, 2024 · 3d37640 · 3d37640
1 parent 47734bb
commit 3d37640
Show file tree

Hide file tree

Showing 12 changed files with 514 additions and 506 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "paket": {
-      "version": "8.0.0-alpha002",
+      "version": "8.0.3",
       "commands": [
         "paket"
       ]

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -23,8 +23,8 @@
         "ghcr.io/devcontainers-contrib/features/starship:1": {},
         // https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
         "ghcr.io/devcontainers/features/dotnet:2": {
-            "version": "7.0",
-            "additionalVersions": "6.0"
+            "version": "8.0",
+            "additionalVersions": "6.0, 7.0"
         }
     },
     "overrideFeatureInstallOrder": [

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,6 +29,7 @@ jobs:
         with:
           global-json-file: global.json
           dotnet-version: |
+            8.x
             7.x
             6.x
       # Build on mac/linux

diff --git a/.github/workflows/fsdocs-gh-pages.yml b/.github/workflows/fsdocs-gh-pages.yml
@@ -34,6 +34,8 @@ jobs:
         with:
           global-json-file: global.json
           dotnet-version: |
+            8.x
+            7.x
             6.x
       - name: Build Docs
         run: |

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -40,8 +40,9 @@ jobs:
         with:
           global-json-file: global.json
           dotnet-version: |
-            6.x
+            8.x
             7.x
+            6.x
       - name: publish
         env:
           NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "7.0.400"
+        "version": "8.0.100"
     }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -14,6 +14,7 @@ group Test
   source https://www.nuget.org/api/v2
   source https://api.nuget.org/v3/index.json
   nuget Expecto >= 10.1.0
+  nuget Microsoft.Bcl.TimeProvider
   nuget TimeProviderExtensions
   nuget YoloDev.Expecto.TestSdk >= 0.14.2
   nuget Microsoft.NET.Test.Sdk >= 17.7.2

diff --git a/paket.lock b/paket.lock
@@ -370,7 +370,7 @@ NUGET
     FSharp.Core (7.0.401) - restriction: >= netstandard2.1
     Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netstandard2.0)) (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0))
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
-    Microsoft.Bcl.TimeProvider (8.0) - restriction: || (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0))
+    Microsoft.Bcl.TimeProvider (8.0)
       Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
       System.ValueTuple (>= 4.5) - restriction: >= net462
     Microsoft.CodeCoverage (17.7.2) - restriction: || (>= net462) (>= netcoreapp3.1)

diff --git a/tests/IcedTasks.Tests.NS20/IcedTasks.Tests.NS20.fsproj b/tests/IcedTasks.Tests.NS20/IcedTasks.Tests.NS20.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net7.0</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefineConstants>$(DefineConstants);NETSTANDARD2_0;TEST_NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>

diff --git a/tests/IcedTasks.Tests.NS21/IcedTasks.Tests.NS21.fsproj b/tests/IcedTasks.Tests.NS21/IcedTasks.Tests.NS21.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net7.0</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefineConstants>$(DefineConstants);NETSTANDARD2_1;TEST_NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>

diff --git a/tests/IcedTasks.Tests/IcedTasks.Tests.fsproj b/tests/IcedTasks.Tests/IcedTasks.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefineConstants>$(DefineConstants);TEST_NET6_0_OR_GREATER</DefineConstants>
   </PropertyGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ jobs: @@
             with:
               global-json-file: global.json
               dotnet-version: |
+.x
 .x
 .x
           # Build on mac/linux
@@ Expand Down @@