TheAngryByrd · TheAngryByrd · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025 · Mar 29, 2025
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,29 +2,26 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "paket": {
-      "version": "8.0.3",
-      "commands": [
-        "paket"
-      ]
-    },
     "fsharp-analyzers": {
       "version": "0.11.0",
       "commands": [
         "fsharp-analyzers"
-      ]
+      ],
+      "rollForward": false
     },
     "fantomas": {
-      "version": "6.2.0",
+      "version": "7.0.1",
       "commands": [
         "fantomas"
-      ]
+      ],
+      "rollForward": false
     },
     "fsdocs-tool": {
       "version": "20.0.0-alpha-018",
       "commands": [
         "fsdocs"
-      ]
+      ],
+      "rollForward": false
     }
   }
-}
+}
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": "8.0",
-            "additionalVersions": "6.0"
+            "version": "9.0",
+            "additionalVersions": "8.0"
         }
     },
     "overrideFeatureInstallOrder": [
@@ -40,7 +40,6 @@
                 "ms-dotnettools.csharp",
                 "Ionide.Ionide-fsharp",
                 "tintoy.msbuild-project-tools",
-                "ionide.ionide-paket",
                 "usernamehw.errorlens",
                 "alefragnani.Bookmarks",
                 "oderwat.indent-rainbow",

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

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,7 +3,6 @@
         "ms-dotnettools.csharp",
         "Ionide.Ionide-fsharp",
         "tintoy.msbuild-project-tools",
-        "ionide.ionide-paket",
         "usernamehw.errorlens",
         "alefragnani.Bookmarks",
         "oderwat.indent-rainbow",

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,11 +10,22 @@
         <!-- owners is not supported in MSBuild -->
         <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelIlxGen --test:ParallelOptimization </OtherFlags>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <NoWarn>$(NoWarn);FS2003; NU1903; NU1904</NoWarn>
+        <!-- <NoWarn>$(NoWarn);FS2003; NU1903; NU1904; NU1504</NoWarn> -->
+        <NoWarn>$(NoWarn);FS0057</NoWarn> <!-- Suppress warning FS0057, Resumable code -->
+        <NoWarn>$(NoWarn);NU5104</NoWarn> <!-- Suppress warning NU5104, A stable release of a package should not have a prerelease dependency -->
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
        <!--
         * FS3517 InlineIfLambda didn't get inlined
         -->
         <!-- <WarnOn>$(WarnOn);3517</WarnOn> -->
+
+
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.fsproj'">
+        <DisableImplicitFSharpCoreReference>True</DisableImplicitFSharpCoreReference>
+
+        <LangVersion>8.0</LangVersion>
+        <LangVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0</LangVersion>
+        <Nullable Condition="'$(TargetFramework)' == 'net9.0'">enable</Nullable>
     </PropertyGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -11,8 +11,8 @@ See https://learn.microsoft.com/en-us/visualstudio/msbuild/customize-by-director
     <_DotnetFantomasOutputFile>$(BaseIntermediateOutputPath)dotnet-fantomas-msbuild-$(NETCoreSdkVersion)-$(OS)</_DotnetFantomasOutputFile>
   </PropertyGroup>
 
-  <!-- Make sure that dotnet tools (including paket) are restored before restoring any project -->
-  <Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences;PaketRestore" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
+  <!-- Make sure that dotnet tools are restored before restoring any project -->
+  <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" />

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,41 @@
+<Project>
+  <PropertyGroup>
+    <!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Main Package -->
+    <PackageVersion Include="FSharp.Core" Version="6.0.1"  NoWarn="NU1504"/>
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0"/>
+
+    <!-- Benchmarks -->
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.9"/>
+    <PackageVersion Include="Ply" Version="0.3.1"/>
+
+    <!-- Test -->
+    <PackageVersion Include="Expecto" Version="10.1.0" />
+    <PackageVersion Include="Expecto.FsCheck" Version="10.1.0" />
+    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
+    <PackageVersion Include="TimeProviderExtensions" Version="1.0.0" />
+    <PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="FSharp.Control.TaskSeq" Version="0.4.0" />
+
+
+  <!-- Build -->
+  <PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
+  <PackageVersion Include="Fake.Core.Target" Version="6.0.0" />
+  <PackageVersion Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
+  <PackageVersion Include="Fake.Core.Environment" Version="6.0.0" />
+  <PackageVersion Include="Fake.DotNet.Cli" Version="6.0.0" />
+  <PackageVersion Include="Fake.Core.Process" Version="6.0.0" />
+  <PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="6.0.0" />
+  <PackageVersion Include="Fake.Tools.Git" Version="6.0.0" />
+  <PackageVersion Include="Fake.Api.GitHub" Version="6.0.0" />
+  <PackageVersion Include="Fake.BuildServer.GitHubActions" Version="6.0.0" />
+  <PackageVersion Include="Argu" Version="6.2.5" />
+  <PackageVersion Include="Octokit" Version="0.50.0" />
+  <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.243" />
+
+  </ItemGroup>
+</Project>
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;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
-    <Import Project="..\..\.paket\Paket.Restore.targets" />
+
 </Project>
diff --git a/benchmarks/CSharpTaskBenchmarks/paket.references b/benchmarks/CSharpTaskBenchmarks/paket.references
diff --git a/benchmarks/FSharpBenchmarks/FileWritingBenchmarks.fs b/benchmarks/FSharpBenchmarks/FileWritingBenchmarks.fs
@@ -34,10 +34,7 @@ type FileWriteBenchmarks() =
     [<BenchmarkCategory("ManyWriteFile", csharp, taskBuilder);
       Benchmark(Baseline = true, OperationsPerInvoke = manyIterationsConst)>]
     member x.CSharp_ManyWriteFile_TaskBuilder() =
-        TaskPerfCSharp
-            .ManyWriteFileAsync(x.manyIterations, x.bufferSize)
-            .GetAwaiter()
-            .GetResult()
+        TaskPerfCSharp.ManyWriteFileAsync(x.manyIterations, x.bufferSize).GetAwaiter().GetResult()
 
     [<BenchmarkCategory("ManyWriteFile", csharp, valueTaskBuilder);
       Benchmark(OperationsPerInvoke = manyIterationsConst)>]

diff --git a/benchmarks/FSharpBenchmarks/Program.fs b/benchmarks/FSharpBenchmarks/Program.fs
@@ -10,8 +10,6 @@ open IcedTasks.Benchmarks
 let main argv =
 
     let summary =
-        BenchmarkSwitcher
-            .FromAssembly(typeof<SyncCompletionBenchmarks>.Assembly)
-            .Run(argv)
+        BenchmarkSwitcher.FromAssembly(typeof<SyncCompletionBenchmarks>.Assembly).Run(argv)
 
     0
diff --git a/benchmarks/FSharpBenchmarks/SynchonousCompletionBenchmark.fs b/benchmarks/FSharpBenchmarks/SynchonousCompletionBenchmark.fs
@@ -614,11 +614,7 @@ type SyncCompletionBenchmarks() =
         let mutable z = 0
 
         for i in 1 .. x.manyIterations do
-            z <-
-                TaskPerfCSharp
-                    .CSharp_TenBindsSync_TaskBuilder_BindTask()
-                    .GetAwaiter()
-                    .GetResult()
+            z <- TaskPerfCSharp.CSharp_TenBindsSync_TaskBuilder_BindTask().GetAwaiter().GetResult()
 
         z
 

diff --git a/benchmarks/FSharpBenchmarks/benchmarks.fsproj b/benchmarks/FSharpBenchmarks/benchmarks.fsproj
@@ -1,17 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <Configuration>Release</Configuration>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <Tailcalls>true</Tailcalls>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Consts.fs" />
     <Compile Include="SynchonousCompletionBenchmark.fs" />
@@ -24,5 +21,8 @@
     <ProjectReference Include="..\..\src\IcedTasks\IcedTasks.fsproj" />
     <ProjectReference Include="..\CSharpTaskBenchmarks\CSharpTaskBenchmarks.csproj" />
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="Ply"/>
+  </ItemGroup>
 </Project>
diff --git a/benchmarks/FSharpBenchmarks/fileWriting.ps1 b/benchmarks/FSharpBenchmarks/fileWriting.ps1
@@ -1 +1 @@
-dotnet run -c Release -f net8.0 -- --filter "*IcedTasks.Benchmarks.FileWriteBenchmarks*" --runtimes net6.0 net8.0
+dotnet run -c Release -f net8.0 -- --filter "*IcedTasks.Benchmarks.FileWriteBenchmarks*" --runtimes net9.0 net8.0
diff --git a/benchmarks/FSharpBenchmarks/paket.references b/benchmarks/FSharpBenchmarks/paket.references
diff --git a/build/build.fs b/build/build.fs
@@ -321,8 +321,6 @@ let clean _ =
     )
     |> Shell.cleanDirs
 
-    [ "paket-files/paket.restore.cached" ]
-    |> Seq.iter Shell.rm
 
 let dotnetRestore _ =
     [ sln ]
@@ -540,7 +538,7 @@ let gitRelease _ =
     Git.Staging.stageFile "" "CHANGELOG.md"
     |> ignore
 
-    !! "src/**/AssemblyInfo.fs"
+    !!"src/**/AssemblyInfo.fs"
     |> Seq.iter (
         Git.Staging.stageFile ""
         >> ignore

diff --git a/build/build.fsproj b/build/build.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,5 +11,21 @@
     <Compile Include="Changelog.fs" />
     <Compile Include="build.fs" />
   </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
+
+  <ItemGroup>
+    <PackageReference Include="Argu" />
+    <PackageReference Include="Fake.IO.FileSystem" />
+    <PackageReference Include="Fake.Core.Target" />
+    <PackageReference Include="Fake.Core.ReleaseNotes" />
+    <PackageReference Include="Fake.Core.Environment" />
+    <PackageReference Include="Fake.DotNet.Cli" />
+    <PackageReference Include="Fake.Core.Process" />
+    <PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
+    <PackageReference Include="Fake.Tools.Git" />
+    <PackageReference Include="Fake.Api.GitHub" />
+    <PackageReference Include="Fake.BuildServer.GitHubActions" />
+    <PackageReference Include="Octokit" />
+    <PackageReference Include="MSBuild.StructuredLogger"/>
+
+  </ItemGroup>
 </Project>
diff --git a/build/paket.references b/build/paket.references
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100",
+        "version": "9.0.100",
         "rollForward": "latestMinor"
     }
 }
diff --git a/paket.dependencies b/paket.dependencies
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dotnet run -c Release -f net8.0 -- --filter "IcedTasks.Benchmarks.FileWriteBenchmarks" --runtimes net6.0 net8.0
		dotnet run -c Release -f net8.0 -- --filter "IcedTasks.Benchmarks.FileWriteBenchmarks" --runtimes net9.0 net8.0