Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions source/Halibut/Halibut.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -41,7 +41,7 @@
<PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.2.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
</ItemGroup>

Expand All @@ -50,7 +50,7 @@
<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>

Expand Down