From 0218eda98a35ec99a2abbcaa141097fbfb92b571 Mon Sep 17 00:00:00 2001
From: Stephen Burman <stephen.burman@octopus.com>
Date: Wed, 21 Oct 2026 10:58:29 +1100
Subject: [PATCH 1/2] Target net10.0 for the Halibut library

+semver: major

Tentacle is moving to .NET 10, so Halibut no longer needs to target net8.0.

- Retarget the Halibut library net8.0 -> net10.0 (net48 retained on Windows).
  This reverts #728.
- Restore CompileDotNet to build the whole solution for net10.0.
- Drop System.IO.FileSystem.AccessControl and limit Microsoft.Bcl.AsyncInterfaces
  to net48; both are in-box on net10.0.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 build/Build.cs                | 17 +----------------
 source/Halibut/Halibut.csproj | 12 ++++--------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/build/Build.cs b/build/Build.cs
index cdedcdad..dd0c3464 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -80,22 +80,7 @@ class Build : NukeBuild
 
     Target CompileNetFramework => _ => CompileDefinition(_, "net48");
 
-    // Halibut itself targets net8.0 (minimum supported), so only build the test project for net10.0;
-    // its project references are built for their own compatible target framework.
-    // Once Halibut no longer targets net8.0 (i.e. it targets net10.0 again), revert this to:
-    //   Target CompileDotNet => _ => CompileDefinition(_, "net10.0");
-    Target CompileDotNet => _ => _
-        .DependsOn(Restore)
-        .Executes(() =>
-        {
-            DotNetBuild(s => s
-                .SetProjectFile(Solution.Halibut_Tests)
-                .SetConfiguration(Configuration)
-                .SetFramework("net10.0")
-                .SetVersion(FullSemVer)
-                .SetInformationalVersion(OctoVersionInfo.InformationalVersion)
-                .EnableNoRestore());
-        });
+    Target CompileDotNet => _ => CompileDefinition(_, "net10.0");
 
     ITargetDefinition CompileDefinition(ITargetDefinition targetDefinition, [CanBeNull] string framework)
     {
diff --git a/source/Halibut/Halibut.csproj b/source/Halibut/Halibut.csproj
index 0d5eb4b1..a2656489 100644
--- a/source/Halibut/Halibut.csproj
+++ b/source/Halibut/Halibut.csproj
@@ -19,10 +19,10 @@
 	  <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
-    <TargetFrameworks>net48;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net10.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>True</Optimize>
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="StackExchange.Redis" Version="2.8.58" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" Condition=" '$(TargetFramework)' == 'net48' " />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" Condition=" '$(TargetFramework)' == 'net48' " />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
@@ -41,16 +41,12 @@
     <PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.2.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.Configuration" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
     <DefineConstants>$(DefineConstants);LIBLOG_PORTABLE;HAS_TCP_KEEP_ALIVE_SOCKET_OPTIONS</DefineConstants>
   </PropertyGroup>
 

From 1f40cb6ff2d07583cabbede027839cded800357e Mon Sep 17 00:00:00 2001
From: Stephen Burman <stephen.burman@octopus.com>
Date: Wed, 21 Oct 2026 13:12:26 +1100
Subject: [PATCH 2/2] Restore Microsoft.Bcl.AsyncInterfaces and
 System.IO.FileSystem.AccessControl references

Keep this PR an exact revert of #728; trimming in-box package references
can be done separately.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 source/Halibut/Halibut.csproj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/Halibut/Halibut.csproj b/source/Halibut/Halibut.csproj
index a2656489..46b60807 100644
--- a/source/Halibut/Halibut.csproj
+++ b/source/Halibut/Halibut.csproj
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="StackExchange.Redis" Version="2.8.58" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" Condition=" '$(TargetFramework)' == 'net48' " />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" Condition=" '$(TargetFramework)' == 'net48' " />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
@@ -41,6 +41,10 @@
     <PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.2.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.Configuration" />
     <Reference Include="Microsoft.CSharp" />