Merge pull request #177 from njlr/housekeeping/upgrade-net8

housekeeping/upgrade-net8

Author: dsyme

.config/dotnet-tools.json

@@ -6,13 +6,15 @@
       "version": "11.4.3",
       "commands": [
         "fsdocs"
-      ]
+      ],
+      "rollForward": false
     },
     "fable": {
-      "version": "3.4.2",
+      "version": "4.25.0",
       "commands": [
         "fable"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

.github/workflows/publish.yml

@@ -8,16 +8,16 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4.3.1
       with:
-        dotnet-version: '5.0.202'
+        dotnet-version: '8.0.x'
     - name: Install tools
       run: dotnet tool restore
-    - name: Build and Test 
+    - name: Build and Test
       run: dotnet test -c Release
     - name: Pack
       run: dotnet pack -c Release
-    - name: Build docs 
+    - name: Build docs
       run: dotnet fsdocs build --properties Configuration=Release
     - name: Deploy
       uses: peaceiris/actions-gh-pages@v3
@@ -30,5 +30,4 @@ jobs:
       run: dotnet nuget push src/FSharp.Control.AsyncSeq/bin/Release/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_TOKEN_2021 }} --skip-duplicate
 
 # NUGET_ORG_TOKEN_2021 is listed in "Repository secrets" in https://github.com/fsprojects/FSharp.Control.AsyncSeq/settings/secrets/actions
-# note, the nuget org token expires around 24 July 2022
-
+# note, the nuget org token expires around 24 July 2022

.github/workflows/pull-request.yml

@@ -9,17 +9,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4.3.1
       with:
-        dotnet-version: '5.0.202'
+        dotnet-version: '8.0.x'
     - name: Setup Node.js environment
       uses: actions/setup-node@v2.4.0
       with:
-        node-version: 14.17.*        
+        node-version: 14.17.*
     - name: Install tools
       run: dotnet tool restore
-    - name: Build and Test 
+    - name: Build and Test
       run: dotnet test -c Release
     - name: Test Fable
-      run: cd tests/fable && npm i && npm test && cd ../..
+      run: (cd tests/fable && npm i && npm test)

flake.lock

@@ -0,0 +1,38 @@
+{
+  description = "FSharp.Control.AsyncSeq";
+
+  # Flake inputs
+  inputs = {
+    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2405.*.tar.gz";
+  };
+
+  # Flake outputs
+  outputs = { self, nixpkgs }:
+    let
+      # Systems supported
+      allSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+
+      # Helper to provide system-specific attributes
+      forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
+        pkgs = import nixpkgs { inherit system; };
+      });
+    in
+    {
+      # Development environment output
+      devShells = forAllSystems ({ pkgs }: {
+        default =
+
+          pkgs.mkShell {
+            packages = [
+              # pkgs.bashInteractive
+              pkgs.dotnetCorePackages.sdk_8_0
+            ];
+          };
+      });
+    };
+}

flake.nix

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.202",
+    "version": "8.0.19",
     "rollForward": "minor"
   }
 }

global.json

@@ -1,4 +1,4 @@
-#r @"../../bin/FSharp.Control.AsyncSeq.dll"
+#r @"../../src/FSharp.Control.AsyncSeq/bin/Release/netstandard2.1/FSharp.Control.AsyncSeq.dll"
 #nowarn "40"
 #time "on"
 
@@ -107,7 +107,7 @@ let bindUnfold =
 
 
 
-let collect n = 
+let collect n =
   AsyncSeq.replicate n ()
   |> AsyncSeq.collect (fun () -> AsyncSeq.singleton ())
   |> AsyncSeq.iter ignore
@@ -122,7 +122,7 @@ let collect n =
 
 let Y = Choice1Of2
 let S = Choice2Of2
-  
+
 let timeMs = 500
 
 let inp0 = [ ]
@@ -138,19 +138,18 @@ let toSeq (xs:Choice<int, int> list) = asyncSeq {
   for x in xs do
     match x with
     | Choice1Of2 v -> yield v
-    | Choice2Of2 s -> do! Async.Sleep s }    
+    | Choice2Of2 s -> do! Async.Sleep s }
 
 for (inp,exp) in [ (inp0,exp0) ; (inp1,exp1) ] do
 
-  let actual = 
+  let actual =
     toSeq inp
     |> AsyncSeq.bufferByTime (timeMs - 5)
     |> AsyncSeq.map List.ofArray
     |> AsyncSeq.toListSynchronously
-  
+
   printfn "actual=%A expected=%A" actual exp
 
   //let ls = toSeq inp |> AsyncSeq.toListSynchronously
   //let actualLs = actual |> List.concat
 
-  

tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqPerf.fsx

@@ -1,5 +1,5 @@
 #if INTERACTIVE
-#load @"../../.paket/load/netcoreapp3.1/Test/NUnit.fsx"
+#r "nuget: NUnit, 3.9.0"
 #time "on"
 #else
 
@@ -10,7 +10,6 @@ open NUnit.Framework
 open FSharp.Control
 open System
 open System.Threading
-open System.Threading.Tasks
 
 type AsyncOps = AsyncOps with
   static member unit : Async<unit> = async { return () }

tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs

@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -13,4 +14,4 @@
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
   </ItemGroup>
-</Project>
+</Project>