Remove paket, Enforce nullness on net9.0, remove mocha

.config/dotnet-tools.json

@@ -2,36 +2,29 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "paket": {
-      "version": "9.0.2",
-      "commands": [
-        "paket"
-      ],
-      "rollForward": false
-    },
     "fable": {
-      "version": "4.4.0",
+      "version": "4.25.0",
       "commands": [
         "fable"
       ],
       "rollForward": false
     },
     "fantomas": {
-      "version": "7.0.0",
+      "version": "7.0.2",
       "commands": [
         "fantomas"
       ],
       "rollForward": false
     },
     "femto": {
-      "version": "0.19.0",
+      "version": "0.21.0",
       "commands": [
         "femto"
       ],
       "rollForward": false
     },
     "fsharp-analyzers": {
-      "version": "0.28.0",
+      "version": "0.31.0",
       "commands": [
         "fsharp-analyzers"
       ],

.devcontainer/devcontainer.json

@@ -27,7 +27,7 @@
             "additionalVersions": "8.0"
         },
         "ghcr.io/devcontainers/features/node:1": {
-            "version": "18"
+            "version": "22"
         },
         "ghcr.io/devcontainers/features/python:1": {
             "version": "3.10"
@@ -46,7 +46,6 @@
                 "ms-dotnettools.csharp",
                 "Ionide.Ionide-fsharp",
                 "tintoy.msbuild-project-tools",
-                "ionide.ionide-paket",
                 "usernamehw.errorlens",
                 "alefragnani.Bookmarks",
                 "oderwat.indent-rainbow",

.editorconfig

@@ -54,15 +54,6 @@ end_of_line = crlf
 [*.{ps1, psm1}]
 end_of_line = crlf
 
-# Paket files
-[paket.*]
-trim_trailing_whitespace = true
-indent_size = 2
-
-[*.paket.references]
-trim_trailing_whitespace = true
-indent_size = 2
-
 # YAML Files
 [*.{yml,yaml}]
 indent_size = 2

.github/workflows/build.yml

@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        node-version: ['18', '20', 'latest' ]
+        node-version: ['lts/-1', 'lts/*', 'latest' ]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -164,3 +164,5 @@ jobs:
           with:
             # You can also specify the path to a folder for `sarif_file`
             sarif_file: analysisreports
+          # make this step optional, so that it does not fail the workflow
+          continue-on-error: true

.gitignore

@@ -371,9 +371,6 @@ FakesAssemblies/
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
 
-# Paket dependency manager
-paket-files/
-
 # FAKE - F# Make
 .fake/
 

.vscode/extensions.json

@@ -1,6 +1,5 @@
 {
     "recommendations": [
-        "ionide.ionide-paket",
         "ionide.ionide-fsharp",
         "ionide.ionide-fake",
         "ms-dotnettools.csharp",

Directory.Build.props

@@ -13,6 +13,7 @@
     <LangVersion>8.0</LangVersion>
     <LangVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0</LangVersion>
     <Nullable Condition="'$(TargetFramework)' == 'net9.0'">enable</Nullable>
-    <PaketPropsVersion>6.0.0</PaketPropsVersion> <!--  Hack to prevent paket from restoring when it should not -->
   </PropertyGroup>
+
+
 </Project>

Directory.Packages.props

@@ -0,0 +1,51 @@
+<Project>
+  <PropertyGroup>
+    <!-- Enable central package management -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Core Dependencies -->
+    <PackageVersion Include="FSharp.Core" Version="6.0.1" />
+    <PackageVersion Include="Hopac" Version="0.5.1" />
+    <PackageVersion Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
+    <PackageVersion Include="Fable.Core" Version="4.2.0" />
+    <PackageVersion Include="IcedTasks" Version="0.11.8" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+
+    <!-- Test group dependencies -->
+    <PackageVersion Include="Expecto" Version="10.2.3" />
+    <PackageVersion Include="Expecto.Hopac" Version="10.2.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
+    <PackageVersion Include="Fable.Python" Version="4.3.0" />
+    <PackageVersion Include="Fable.Pyxpecto" Version="1.3.0" />
+
+    <!-- Benchmarks group dependencies -->
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.0" />
+    <PackageVersion Include="BenchmarkDotNet.Annotations" Version="0.15.0" />
+    <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.0" />
+
+    <!-- Build group dependencies -->
+    <PackageVersion Include="Fake.Core.Target" Version="5.22.0" />
+    <PackageVersion Include="Fake.DotNet.Cli" Version="5.22.0" />
+    <PackageVersion Include="Fake.Core.ReleaseNotes" Version="5.22.0" />
+    <PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="5.22.0" />
+    <PackageVersion Include="Fake.DotNet.Testing.Expecto" Version="5.22.0" />
+    <PackageVersion Include="Fake.Tools.Git" Version="5.22.0" />
+    <PackageVersion Include="Fake.JavaScript.Npm" Version="5.22.0" />
+    <PackageVersion Include="Fake.Api.GitHub" Version="5.22.0" />
+    <PackageVersion Include="Fake.BuildServer.GitHubActions" Version="5.22.0" />
+    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.206" />
+    <PackageVersion Include="Octokit" Version="0.53.0" />
+    <PackageVersion Include="Nuget.Common" Version="6.6.1" />
+    <PackageVersion Include="NuGet.Protocol" Version="6.6.1" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
+
+    <!-- Analyzers group dependencies -->
+    <PackageVersion Include="Ionide.Analyzers" Version="0.14.5" />
+    <PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.15.0" />
+  </ItemGroup>
+
+
+</Project>

Directory.Solution.targets

@@ -5,7 +5,7 @@
     <_DotnetToolRestoreOutputFile>$(_BuildProjBaseIntermediateOutputPath)/dotnet-tool-restore-$(NETCoreSdkVersion)-$(OS)</_DotnetToolRestoreOutputFile>
   </PropertyGroup>
 
-  <Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences;PaketRestore" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
+  <Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
     <Exec Command="dotnet tool restore" WorkingDirectory="$(MSBuildThisFileDirectory)" StandardOutputImportance="High" StandardErrorImportance="High" />
     <MakeDir Directories="$(_BuildProjBaseIntermediateOutputPath)"/>
     <Touch Files="$(_DotnetToolRestoreOutputFile)" AlwaysCreate="True" ForceTouch="True" />

benchmarks/SeqTests.fs

@@ -6,6 +6,7 @@ open BenchmarkDotNet.Mathematics
 open BenchmarkDotNet.Configs
 open System.Threading
 open System
+open FsToolkit.ErrorHandling
 
 module sequenceResultMTests =
 

benchmarks/benchmarks.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
@@ -27,5 +27,8 @@
     <ProjectReference
       Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
   </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
+
+    <ItemGroup>
+      <PackageReference Include="BenchmarkDotnet"/>
+    </ItemGroup>
 </Project>

build/build.fs

@@ -32,6 +32,8 @@ let environVarAsBoolOrDefault varName defaultValue =
 
 let project = "FsToolkit.ErrorHandling"
 
+let publishUrl = "https://www.nuget.org"
+
 let summary =
     "FsToolkit.ErrorHandling is a utility library to work with the Result type in F#, and allows you to do clear, simple and powerful error handling."
 
@@ -201,9 +203,6 @@ let clean _ =
     ++ "**/.python-tests"
     |> Shell.cleanDirs
 
-    [ "paket-files/paket.restore.cached" ]
-    |> Seq.iter Shell.rm
-
 
 module BuildParameters =
     let common (defaults: MSBuild.CliArguments) = {
@@ -229,11 +228,6 @@ let build ctx =
 
 
 let restore _ =
-    Fake.DotNet.Paket.restore (fun p -> {
-        p with
-            ToolType = ToolType.CreateLocalTool()
-    })
-
     let setParams (c: DotNet.RestoreOptions) = {
         c with
             MSBuildParams = BuildParameters.common c.MSBuildParams
@@ -306,6 +300,7 @@ let runPythonTests _ =
             CreateProcess.fromRawCommand "dotnet" [
                 "fable"
                 testProject
+                "--noCache"
                 "--lang"
                 "py"
                 "-o"
@@ -392,16 +387,22 @@ let dotnetPack ctx =
 
 
 let publishNuget _ =
-    Paket.push (fun p -> {
-        p with
-            ToolType = ToolType.CreateLocalTool()
-            PublishUrl = "https://www.nuget.org"
-            WorkingDir = distDir
-            ApiKey =
-                match nugetToken.Value with
-                | Some s -> s
-                | _ -> p.ApiKey // assume paket-config was set properly
-    })
+
+
+    DotNet.nugetPush
+        (fun c -> {
+            c with
+                Common = {
+                    c.Common with
+                        WorkingDirectory = distDir
+                }
+                PushParams = {
+                    c.PushParams with
+                        Source = Some publishUrl
+                        ApiKey = nugetToken.Value
+                }
+        })
+        "*.nupkg"
 
 
 let remote = Environment.environVarOrDefault "FSTK_GIT_REMOTE" "origin"

build/build.fsproj

@@ -9,5 +9,15 @@
         <Compile Include="DotEnv.fs" />
         <Compile Include="build.fs" />
     </ItemGroup>
-    <Import Project="..\.paket\Paket.Restore.targets" />
+    <ItemGroup>
+        <PackageReference Include="Fake.Core.Target" />
+        <PackageReference Include="Fake.DotNet.Cli" />
+        <PackageReference Include="Fake.Core.ReleaseNotes" />
+        <PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
+        <PackageReference Include="Fake.DotNet.Testing.Expecto" />
+        <PackageReference Include="Fake.Tools.Git" />
+        <PackageReference Include="Fake.JavaScript.Npm" />
+        <PackageReference Include="Fake.Api.GitHub" />
+        <PackageReference Include="Fake.BuildServer.GitHubActions" />
+    </ItemGroup>
 </Project>