Drop net7 (#42)

* Drop net 7 support * speed up tests * Fix benchmark scripts * drop net7 from build/devcontainer * giglobaljson woes
TheAngryByrd · Feb 22, 2024 · 4a903d9 · 4a903d9
1 parent 49d4fbd
commit 4a903d9
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 26 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -24,7 +24,7 @@
         // https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
         "ghcr.io/devcontainers/features/dotnet:2": {
             "version": "8.0",
-            "additionalVersions": "6.0, 7.0"
+            "additionalVersions": "6.0"
         }
     },
     "overrideFeatureInstallOrder": [

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

diff --git a/README.md b/README.md
@@ -277,7 +277,7 @@ IcedTasks | [![NuGet Badge](https://buildstats.info/nuget/IcedTasks)](https://ww
 
 Make sure the following **requirements** are installed on your system:
 
-- [dotnet SDK](https://www.microsoft.com/net/download/core) 7.0 or higher
+- [dotnet SDK](https://www.microsoft.com/net/download/core) 6.0 & 8.0 
 
 or
 

diff --git a/benchmarks/CSharpTaskBenchmarks/CSharpTaskBenchmarks.csproj b/benchmarks/CSharpTaskBenchmarks/CSharpTaskBenchmarks.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/benchmarks/FSharpBenchmarks/asyncCompletion.ps1 b/benchmarks/FSharpBenchmarks/asyncCompletion.ps1
@@ -1 +1 @@
-dotnet run -c Release -f net7.0 -- --filter "*IcedTasks.Benchmarks.AsyncCompletionBenchmarks*"
+dotnet run -c Release -f net8.0 -- --filter "*IcedTasks.Benchmarks.AsyncCompletionBenchmarks*"
diff --git a/benchmarks/FSharpBenchmarks/benchmarks.fsproj b/benchmarks/FSharpBenchmarks/benchmarks.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -25,4 +25,4 @@
     <ProjectReference Include="..\CSharpTaskBenchmarks\CSharpTaskBenchmarks.csproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/benchmarks/FSharpBenchmarks/fileWriting.ps1 b/benchmarks/FSharpBenchmarks/fileWriting.ps1
@@ -1 +1 @@
-dotnet run -c Release -f net7.0 -- --filter "*IcedTasks.Benchmarks.FileWriteBenchmarks*" --runtimes net6.0 net7.0
+dotnet run -c Release -f net8.0 -- --filter "*IcedTasks.Benchmarks.FileWriteBenchmarks*" --runtimes net6.0 net8.0
diff --git a/benchmarks/FSharpBenchmarks/syncCompletion.ps1 b/benchmarks/FSharpBenchmarks/syncCompletion.ps1
@@ -1 +1 @@
-dotnet run -c Release -f net7.0 -- --filter "*IcedTasks.Benchmarks.SyncCompletionBenchmarks*"
+dotnet run -c Release -f net8.0 -- --filter "*IcedTasks.Benchmarks.SyncCompletionBenchmarks*"
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,4 +12,4 @@
     <Compile Include="build.fs" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/examples/DatabaseDemo/DatabaseDemo.fsproj b/examples/DatabaseDemo/DatabaseDemo.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.100",
+        "rollForward": "latestMinor"
     }
 }
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>net8.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.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>net8.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefineConstants>$(DefineConstants);NETSTANDARD2_1;TEST_NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>

diff --git a/tests/IcedTasks.Tests/CancellablePoolingValueTaskTests.fs b/tests/IcedTasks.Tests/CancellablePoolingValueTaskTests.fs
@@ -968,7 +968,7 @@ module CancellablePoolingValueTaskTests =
                         let doOtherStuff (l: ResizeArray<_>) x =
                             cancellablePoolingValueTask {
                                 l.Add(x)
-                                do! Task.Delay(15)
+                                do! Task.yieldMany 1000
                                 let dt = DateTimeOffset.UtcNow
                                 l.Add(x)
                                 return dt

diff --git a/tests/IcedTasks.Tests/CancellableTaskTests.fs b/tests/IcedTasks.Tests/CancellableTaskTests.fs
@@ -927,7 +927,7 @@ module CancellableTaskTests =
                         let doOtherStuff (l: ResizeArray<_>) x =
                             cancellableTask {
                                 l.Add(x)
-                                do! Task.Delay(15)
+                                do! Task.yieldMany 1000
                                 let dt = DateTimeOffset.UtcNow
                                 l.Add(x)
                                 return dt

diff --git a/tests/IcedTasks.Tests/CancellableValueTaskTests.fs b/tests/IcedTasks.Tests/CancellableValueTaskTests.fs
@@ -958,14 +958,13 @@ module CancellableValueTaskTests =
                 testPropertyWithConfig Expecto.fsCheckConfig "parallelism"
                 <| fun () ->
                     asyncEx {
-                        let! ct = Async.CancellationToken
                         let sequencedList = ResizeArray<_>()
                         let parallelList = ResizeArray<_>()
 
                         let doOtherStuff (l: ResizeArray<_>) x =
                             cancellableValueTask {
                                 l.Add(x)
-                                do! Task.Delay(15)
+                                do! Task.yieldMany 1000
                                 let dt = DateTimeOffset.UtcNow
                                 l.Add(x)
                                 return dt

diff --git a/tests/IcedTasks.Tests/Expect.fs b/tests/IcedTasks.Tests/Expect.fs
@@ -4,6 +4,16 @@ open System
 open System.Threading.Tasks
 open IcedTasks
 
+module Task =
+    /// Runs Task.Yield() `max` times. Useful for places where we want the scheduler to asynchronously yield but really fast.
+    /// We run it max times to ensure it really gets async yielded.
+    /// Alternative would be Task.Delay but can be slow.
+    let yieldMany max =
+        task {
+            for _ = 0 to max do
+                do! Task.Yield()
+        }
+
 module TestHelpers =
     open System.Threading
 
@@ -141,8 +151,7 @@ type ManualTimeProviderExtensions =
         task {
             this.Advance(time)
             //https://github.com/dotnet/runtime/issues/85326
-            do! Task.Yield()
-            do! Task.Delay(5)
+            do! Task.yieldMany 10
         }
 
 

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>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefineConstants>$(DefineConstants);TEST_NET6_0_OR_GREATER</DefineConstants>
   </PropertyGroup>

diff --git a/tests/IcedTasks.Tests/PoolingValueTaskTests.fs b/tests/IcedTasks.Tests/PoolingValueTaskTests.fs
@@ -691,7 +691,7 @@ module PoolingValueTaskTests =
                         let doOtherStuff (l: ResizeArray<_>) x =
                             poolingValueTask {
                                 l.Add(x)
-                                do! Task.Delay(15)
+                                do! Task.yieldMany 1000
                                 let dt = DateTimeOffset.UtcNow
                                 l.Add(x)
                                 return dt

diff --git a/tests/IcedTasks.Tests/TaskTests.fs b/tests/IcedTasks.Tests/TaskTests.fs
@@ -694,7 +694,7 @@ module TaskTests =
                         let doOtherStuff (l: ResizeArray<_>) x =
                             task {
                                 l.Add(x)
-                                do! Task.Delay(15)
+                                do! Task.yieldMany 1000
                                 let dt = DateTimeOffset.UtcNow
                                 l.Add(x)
                                 return dt

diff --git a/tests/IcedTasks.Tests/ValueTaskTests.fs b/tests/IcedTasks.Tests/ValueTaskTests.fs
@@ -691,7 +691,7 @@ module ValueTaskTests =
                         let doOtherStuff (l: ResizeArray<_>) x =
                             valueTask {
                                 l.Add(x)
-                                do! Task.Delay(15)
+                                do! Task.yieldMany 1000
                                 let dt = DateTimeOffset.UtcNow
                                 l.Add(x)
                                 return dt