Skip to content

Commit be964e9

Browse files
Port GenerateImagesInCSharpUsingImageMagick to .NET 10 and Magick.NET 15 (#2337)
Retarget both projects to net10.0, move Magick.NET-Q8-AnyCPU to 15.0.0 and the test packages to xunit 2.9.3, xunit.runner.visualstudio 4.0.1, Microsoft.NET.Test.Sdk 18.11.0 and coverlet.collector 10.1.0. Add the ImageMagick.Drawing namespace, take uint sizes, cast Width and Height to int, dispose the image with using var, and rename the test class off Live so CI runs it.
1 parent 3a7fa4b commit be964e9

5 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎csharp-images/GenerateImagesInCSharpUsingImageMagick/ImageMagickLibrary/ImageMagickLibrary.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.6.0" />
11+
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="15.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎csharp-images/GenerateImagesInCSharpUsingImageMagick/ImageMagickLibrary/ImageService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using ImageMagick;
2+
using ImageMagick.Drawing;
23

34
namespace ImageMagickLibrary;
45

56
public static class ImageService
67
{
7-
public static MagickImage CreateBlankImage(int width, int height, MagickColor color)
8+
public static MagickImage CreateBlankImage(uint width, uint height, MagickColor color)
89
{
910
return new MagickImage(color, width, height);
1011
}

‎csharp-images/GenerateImagesInCSharpUsingImageMagick/ImageMagickLibrary/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
string outputPath = @"outputImage.png";
55

6-
var image = ImageService.CreateBlankImage(480, 300, MagickColors.AliceBlue);
6+
using var image = ImageService.CreateBlankImage(480, 300, MagickColors.AliceBlue);
77
var strokeColor = MagickColors.YellowGreen;
88
var fillColor = MagickColors.Transparent;
9-
var circle = ImageService.CreateCircle(image.Width / 2, image.Height / 2, 100, 5, strokeColor, fillColor);
9+
var circle = ImageService.CreateCircle((int)image.Width / 2, (int)image.Height / 2, 100, 5, strokeColor, fillColor);
1010
ImageService.DrawOnImage(image, circle);
1111
ImageService.SaveImage(image, outputPath);
1212

csharp-images/GenerateImagesInCSharpUsingImageMagick/Tests/ImageMagickLibraryLiveTest.cs renamed to csharp-images/GenerateImagesInCSharpUsingImageMagick/Tests/ImageMagickLibraryTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Tests;
55

6-
public class ImageMagickLibraryLiveTest
6+
public class ImageMagickLibraryTests
77
{
88
private const string OutputPath = @"outputImage.png";
99
private const string NullOutputPath = "";
@@ -18,12 +18,12 @@ public class ImageMagickLibraryLiveTest
1818
private readonly int _invalidPointX = -1;
1919
private readonly int _invalidPointY = -1;
2020

21-
public ImageMagickLibraryLiveTest()
21+
public ImageMagickLibraryTests()
2222
{
2323
_expectedColor = _color;
24-
_centerX = _circle.X + _circle.Width / 2;
25-
_centerY = _circle.Y + _circle.Height / 2;
26-
_radius = _circle.Width / 2;
24+
_centerX = _circle.X + (int)_circle.Width / 2;
25+
_centerY = _circle.Y + (int)_circle.Height / 2;
26+
_radius = (int)_circle.Width / 2;
2727
_strokeWidth = 5;
2828
}
2929

@@ -53,7 +53,7 @@ public void GivenValidSize_WhenCreateBlankImage_ThenReturnMagickImage()
5353
[Theory]
5454
[InlineData(0, 200)]
5555
[InlineData(400, 0)]
56-
public void GivenInvalidSize_WhenCreateBlankImage_ThenThrowArgumentException(int width, int height)
56+
public void GivenInvalidSize_WhenCreateBlankImage_ThenThrowArgumentException(uint width, uint height)
5757
{
5858
// Arrange, Act & Assert
5959
Assert.Throws<ArgumentException>(() => ImageService.CreateBlankImage(width, height, MagickColors.White));

‎csharp-images/GenerateImagesInCSharpUsingImageMagick/Tests/Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="xunit" Version="2.5.3" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
13+
<PackageReference Include="coverlet.collector" Version="10.1.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
15+
<PackageReference Include="xunit" Version="2.9.3" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)