haf · roboz0r · Apr 5, 2026 · Apr 5, 2026 · Apr 5, 2026 · Apr 11, 2026
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,16 +3,18 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.3",
+      "version": "10.3.1",
       "commands": [
         "paket"
-      ]
+      ],
+      "rollForward": false
     },
     "fake-cli": {
-      "version": "6.1.0",
+      "version": "6.1.4",
       "commands": [
         "fake"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -235,23 +235,27 @@
 				<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
 				<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
 				<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+				<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
 				<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
 				<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
 				<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
 				<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
 				<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
+				<ReferenceCondition Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 10">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[9])</ReferenceCondition>
 			</PaketReferencesFileLinesInfo>
-			<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
-				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			<PackageReference Condition=" ('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
 				<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
 				<Aliases Condition=" %(PaketReferencesFileLinesInfo.Aliases) != ''">%(PaketReferencesFileLinesInfo.Aliases)</Aliases>
 				<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
 				<AllowExplicitVersion>true</AllowExplicitVersion>
-
 			</PackageReference>
+			<PackageVersion Condition="('$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct') AND ('%(PaketReferencesFileLinesInfo.ReferenceCondition)' == 'true' Or $(%(PaketReferencesFileLinesInfo.ReferenceCondition)) == 'true')" Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			</PackageVersion>
 		</ItemGroup>
 
 		<PropertyGroup>
@@ -314,7 +318,17 @@
 		</ItemGroup>
 
 		<Error Text="Error Because of PAKET_ERROR_ON_MSBUILD_EXEC (not calling fix-nuspecs)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' " />
-		<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' />
+		<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) show-conditions -s' ConsoleToMSBuild="true" StandardOutputImportance="low">
+			<Output TaskParameter="ConsoleOutput" ItemName="_ConditionProperties"/>
+		</Exec>
+		<ItemGroup>
+			<_DefinedConditionProperties Include="@(_ConditionProperties)" Condition="$(%(Identity)) == 'true'"/>
+		</ItemGroup>
+		<PropertyGroup>
+			<_ConditionsParameter></_ConditionsParameter>
+			<_ConditionsParameter Condition="@(_DefinedConditionProperties) != ''">--conditions @(_DefinedConditionProperties)</_ConditionsParameter>
+		</PropertyGroup>
+		<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" $(_ConditionsParameter)' />
 		<Error Condition="@(_NuspecFiles) == ''" Text='Could not find nuspec files in "$(AdjustedNuspecOutputPath)" (Version: "$(PackageVersion)"), therefore we cannot call "paket fix-nuspecs" and have to error out!' />
 
 		<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">

diff --git a/Build/Build.fsproj b/Build/Build.fsproj
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="paket.references" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/build.fsx → Build/Program.fs b/build.fsx → Build/Program.fs
@@ -1,10 +1,4 @@
-#r "paket: groupref Build //"
-
-#load ".fake/build.fsx/intellisense.fsx"
-#if !FAKE
-#r "netstandard"
-#endif
-
+
 open System
 open System.IO
 open Fake.Core
@@ -17,14 +11,23 @@
 open Fake.BuildServer
 open NoSln
 
-Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
+
+Environment.CurrentDirectory <- Path.Combine(__SOURCE_DIRECTORY__, "..")
+
+let execContext = Context.FakeExecutionContext.Create false "build.fsx" []
+Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
 
 let configuration =
   Environment.environVarOrDefault "CONFIGURATION" "Release"
   |> DotNet.BuildConfiguration.fromString
 
 let release = ReleaseNotes.load "RELEASE_NOTES.md"
-let testFramework = "net6.0"
+let testFrameworks =
+  if Environment.isWindows then
+    ["net10.0"; "net481"]
+  else
+    ["net10.0"]
+
 let dotnetExePath = "dotnet"
 
 let githubToken = lazy(Environment.environVarOrFail "GITHUB_TOKEN")
@@ -60,6 +63,7 @@
   !!"./**/bin/"
   ++ "./**/obj/"
   ++ pkgPath
+  -- "./Build/**/"
   |> Shell.cleanDirs
 
 let normaliseFileToLFEnding filename =
@@ -70,15 +74,17 @@
 let build project =
   DotNet.build (fun p ->
     { p with Configuration = configuration
-             Common = DotNet.Options.withDotNetCliPath dotnetExePath p.Common })
+             Common = DotNet.Options.withDotNetCliPath dotnetExePath p.Common
+             MSBuildParams = { p.MSBuildParams with DisableInternalBinLog = true } })
     project
 
 let runTest project =
-  Trace.logfn "Running %s on .NET Core" project
-  DotNet.exec (DotNet.Options.withDotNetCliPath dotnetExePath)
-    (sprintf "run --framework %s --project %s -c %O" testFramework project configuration)
-    "--summary"
-  |> fun r -> if r.ExitCode <> 0 then failwithf "Running %s on .NET Core failed" project
+  for framework in testFrameworks do
+    Trace.logfn "Running %s on %s" project framework
+    DotNet.exec (DotNet.Options.withDotNetCliPath dotnetExePath)
+      (sprintf "run --framework %s --project %s -c %O" framework project configuration)
+      "--summary"
+    |> fun r -> if r.ExitCode <> 0 then failwithf "Running %s on %s failed" project framework
 
 Target.create "BuildExpecto" (fun _ ->
   let sln = NoSln.WriteSolutionFile(projects=libProjects, useTempSolutionFile=true)
@@ -124,6 +130,7 @@
           "VersionPrefix", release.NugetVersion
           "PackageReleaseNotes", String.toLines release.Notes
         ]
+        DisableInternalBinLog = true
     }
 
   let pkgSln = NoSln.WriteSolutionFile(projects=libProjects, useTempSolutionFile=true)
@@ -174,10 +181,10 @@
 Target.create "All" ignore
 Target.create "CI" ignore

 "CheckEnv"
  ==> "Release"

 "Clean"
  ==> "BuildExpecto"
  ==> "BuildBenchmarkDotNet"
  ==> "BuildTest"

diff --git a/Build/paket.references b/Build/paket.references
@@ -0,0 +1,20 @@
+group Build
+  Fake.Api.GitHub
+  Fake.BuildServer.AppVeyor
+  Fake.BuildServer.Travis
+  Fake.Core.ReleaseNotes
+  Fake.Core.Target
+  Fake.Core.Xml
+  Fake.DotNet.Cli
+  Fake.DotNet.Paket
+  Fake.IO.FileSystem
+  Fake.IO.Zip
+  Fake.Tools.Git
+  Fake.Tools.Octo
+  Microsoft.Build
+  Microsoft.Build.Framework
+  Microsoft.Build.Tasks.Core
+  Microsoft.Build.Utilities.Core
+  FSharp.Core
+  Nuget.Protocol
+  nosln
diff --git a/Expecto.BenchmarkDotNet.Tests/Expecto.BenchmarkDotNet.Tests.fsproj b/Expecto.BenchmarkDotNet.Tests/Expecto.BenchmarkDotNet.Tests.fsproj
@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <!-- Default for non-Windows (Linux/Mac CI) -->
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <!-- Dual target only when building on Windows -->
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0;net481</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BenchmarkDotNetTests.fs" />

diff --git a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PackageId>Expecto.BenchmarkDotNet</PackageId>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Expecto.BenchmarkDotNet.fs" />

diff --git a/Expecto.Diff/Expecto.Diff.fsproj b/Expecto.Diff/Expecto.Diff.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>Expecto.Diff</PackageId>
     <Description>Integration of Expecto with DiffPlex</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Expecto\Expecto.fsproj" />

diff --git a/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj b/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj
@@ -3,7 +3,10 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Focused.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <!-- Default for non-Windows (Linux/Mac CI) -->
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <!-- Dual target only when building on Windows -->
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0;net481</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.fs" />

diff --git a/Expecto.FsCheck/Expecto.FsCheck.fsproj b/Expecto.FsCheck/Expecto.FsCheck.fsproj
@@ -3,7 +3,7 @@
     <PackageId>Expecto.FsCheck</PackageId>
     <Description>Property testing for Expecto, powered by FsCheck</Description>
     <VersionSuffix>fscheck2</VersionSuffix>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FsCheck.fs" />

diff --git a/Expecto.FsCheck3/Expecto.FsCheck3.fsproj b/Expecto.FsCheck3/Expecto.FsCheck3.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageId>Expecto.FsCheck</PackageId>
     <Description>Property testing for Expecto, powered by FsCheck3</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FsCheck3.fs" />

diff --git a/Expecto.Hopac.Tests/Expecto.Hopac.Tests.fsproj b/Expecto.Hopac.Tests/Expecto.Hopac.Tests.fsproj
@@ -4,8 +4,11 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AssemblyName>Expecto.Hopac.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <!-- Default for non-Windows (Linux/Mac CI) -->
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <!-- Dual target only when building on Windows -->
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0;net481</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Tests.fs" />

diff --git a/Expecto.Hopac/Expecto.Hopac.fsproj b/Expecto.Hopac/Expecto.Hopac.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageId>Expecto.Hopac</PackageId>
     <Description>Running Hopac jobs from Expecto</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Expecto.Hopac.fs" />

diff --git a/Expecto.Sample/Expecto.Sample.fsproj b/Expecto.Sample/Expecto.Sample.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Sample</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Expecto.Flip.Sample.fs" />

diff --git a/Expecto.Template/Expecto.Template.fsproj b/Expecto.Template/Expecto.Template.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -21,7 +21,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
     - Create the project in a new folder if -n is specified
-    - Bump default target framework to net9.0
+    - Bump default target framework to net10.0
     </PackageReleaseNotes>
     <!-- Template authoring guide: https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices -->
   </PropertyGroup>

diff --git a/Expecto.Template/content/expecto/ExpectoTemplate.fsproj b/Expecto.Template/content/expecto/ExpectoTemplate.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
 
@@ -15,6 +15,6 @@
     <PackageReference Include="Expecto" Version="10.*" />
     <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.15.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Update="FSharp.Core" Version="7.*" />
+    <PackageReference Update="FSharp.Core" Version="8.*" />
   </ItemGroup>
 </Project>
diff --git a/Expecto.Tests.CSharp/Expecto.Tests.CSharp.csproj b/Expecto.Tests.CSharp/Expecto.Tests.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Tests.CSharp</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net10.0;net481</TargetFrameworks>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/Expecto.Tests.FsCheck3/Expecto.Tests.FsCheck3.fsproj b/Expecto.Tests.FsCheck3/Expecto.Tests.FsCheck3.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net10.0;net481</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FsCheck3Tests.fs" />

diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj
@@ -3,7 +3,10 @@
   <PropertyGroup>
     <AssemblyName>Expecto.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <!-- Default for non-Windows (Linux/Mac CI) -->
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <!-- Dual target only when building on Windows -->
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net10.0;net481</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Prelude.fs" />

diff --git a/Expecto.Tests/Tests.fs b/Expecto.Tests/Tests.fs
@@ -1529,12 +1529,12 @@ let taskTests =
       }
       testTask "can let! bind ValueTask<T>" {
         let expected = 5
-        let valueTask = ValueTask.FromResult(expected)
+        let valueTask = ValueTask<int>(expected)
         let! actual = valueTask
         Expect.equal expected actual "should be able to let! bind ValueTask<T>"
       }
       testTask "can do! bind ValueTask" {
-        let valueTask = ValueTask.CompletedTask
+        let valueTask = ValueTask()
         do! valueTask
       }
       testTask "can let! bind Async<T>" {