Skip to content

Support SixLabors.ImageSharp v3+ on .NET8 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HakanL wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support SixLabors.ImageSharp v3+ on .NET8 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b010192
Update SixLabors.ImageSharp package references
HakanL Jan 13, 2026
32773ce
Update SixLabors.ImageSharp.Drawing package references
HakanL Jan 13, 2026
95e618e
Add null check for logoStream in DecoratedVirtualBoard
HakanL Jan 13, 2026
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
8 changes: 7 additions & 1 deletion src/OpenMacroBoard.SDK/OpenMacroBoard.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@
<Import Project="..\..\..\analyzers.targets" />

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" />
<None Include="icon.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
<PackageReference Include="System.Memory" Version="4.6.3" />
</ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion src/OpenMacroBoard.Tests/OpenMacroBoard.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<PackageReference Include="FakeItEasy" Version="8.3.0" />
<PackageReference Include="AwesomeAssertions" Version="9.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
<PackageReference Include="Verify.Xunit" Version="14.12.0" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
<PackageReference Include="xunit" Version="2.9.3" />
Expand All @@ -36,6 +35,13 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\OpenMacroBoard.Meta.TestUtils\OpenMacroBoard.Meta.TestUtils.csproj" />
<ProjectReference Include="..\OpenMacroBoard.SDK.KeyBitmap.GDI\OpenMacroBoard.SDK.KeyBitmap.GDI.csproj" />
Expand Down
3 changes: 3 additions & 0 deletions src/OpenMacroBoard.VirtualBoard/DecoratedVirtualBoard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ public override void ShowLogo()
.GetExecutingAssembly()
.GetManifestResourceStream("OpenMacroBoard.VirtualBoard.OpenMacroBoard-Logo.png");

if (logoStream == null)
throw new ArgumentNullException();

using var logo = Image.Load(logoStream);
nakedBoard.DrawFullScreenBitmap(logo);

Expand Down