Skip to content

Commit 56dd067

Browse files
steseestesee
authored
Bump SixLabors.ImageSharp from 1.0.4 to 2.0.0
Changed package id
2 parents a5def22 + c1df9e3 commit 56dd067

12 files changed

+233
-149
lines changed

‎.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: .NET build and test
22
env:
3-
CURRENT_VERSION: 1.2.${{ github.run_number }}
3+
CURRENT_VERSION: 2.0.${{ github.run_number }}
44
LAST_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
55

66
on:

‎ImageSharpCompare.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A1B6F6C3-ECBE-471C-AE18-199DEF5982C3}"
1111
ProjectSection(SolutionItems) = preProject
1212
.editorconfig = .editorconfig
13+
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
1314
README.md = README.md
1415
EndProjectSection
1516
EndProject

‎ImageSharpCompare/CompareResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Codeuctivity
1+
namespace Codeuctivity.ImageSharpCompare
22
{
33
/// <summary>
44
/// Dto - outcome of compared images

‎ImageSharpCompare/ICompareResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Codeuctivity
1+
namespace Codeuctivity.ImageSharpCompare
22
{
33
/// <summary>
44
/// Dto - of compared images

‎ImageSharpCompare/ImageSharpCompare.cs

Lines changed: 179 additions & 127 deletions
Large diffs are not rendered by default.

‎ImageSharpCompare/ImageSharpCompare.csproj

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
44
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<RepositoryUrl>https://github.com/Codeuctivity/ImageSharp.Compare</RepositoryUrl>
7-
<PackageTags>Compare Image JPG PNG BMP</PackageTags>
7+
<PackageTags>Compare Image JPG PNG BMP Linux Windows MacOs</PackageTags>
88
<Authors>Stefan Seeland</Authors>
99
<Company>Codeuctivity</Company>
1010
<Version Condition="'$(CURRENT_VERSION)' != ''">$(CURRENT_VERSION)</Version>
1111
<Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
1212
<AssemblyVersion>$(Version)</AssemblyVersion>
1313
<FileVersion>$(Version)</FileVersion>
1414
<PackageVersion>$(Version)</PackageVersion>
15-
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
15+
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
1616
<PackageIcon>NugetIcon.png</PackageIcon>
1717
<PackageProjectUrl>https://github.com/Codeuctivity/ImageSharp.Compare</PackageProjectUrl>
1818
<Description>Compares Images and calculates mean error, absolute error and diff image. Supports optional tolerance mask/images to ignore areas of an image. Use this for automated visual comparing in your unit tests.</Description>
@@ -24,17 +24,29 @@
2424
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2525
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2626
<EmbedUntrackedSources>true</EmbedUntrackedSources>
27-
<LangVersion>8.0</LangVersion>
2827
<Nullable>enable</Nullable>
29-
<PackageId>ImageSharpCompare</PackageId>
30-
<Product>ImageSharpCompare</Product>
28+
<LangVersion>8.0</LangVersion>
29+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
30+
<PackageId>Codeuctivity.ImageSharpCompare</PackageId>
31+
<PackageReadmeFile>nugetReadme.md</PackageReadmeFile>
32+
<Product>Codeuctivity.ImageSharpCompare</Product>
3133
<AssemblyName>Codeuctivity.ImageSharpCompare</AssemblyName>
3234
<RootNamespace>Codeuctivity.ImageSharpCompare</RootNamespace>
33-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
35+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
38+
<Optimize>True</Optimize>
3439
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
41+
<Optimize>True</Optimize>
42+
</PropertyGroup>
43+
44+
<ItemGroup>
45+
<None Include="docs\nugetReadme.md" Pack="true" PackagePath="\" />
46+
</ItemGroup>
3547

3648
<ItemGroup>
37-
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
49+
<PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
3850
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
3951
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.32.0.39516">
4052
<PrivateAssets>all</PrivateAssets>
@@ -47,4 +59,4 @@
4759
<None Include="NugetIcon.png" Pack="true" PackagePath="\" />
4860
</ItemGroup>
4961

50-
</Project>
62+
</Project>

‎ImageSharpCompare/ImageSharpCompareException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Runtime.Serialization;
33

4-
namespace Codeuctivity
4+
namespace Codeuctivity.ImageSharpCompare
55
{
66
/// <summary>
77
/// ImageSharpCompareException gets thrown if comparing of images fails

‎ImageSharpCompare/docs/nugetReadme.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
Compares images
3+
Supports comparing images by using a tolerance mask image.
4+
Linux, Windows, MacOs supported.
5+
6+
Basic example:
7+
8+
```csharp
9+
bool isEqual = ImageSharpCompare.ImagesAreEqual("actual.png", "expected.png");
10+
11+
// calcs MeanError, AbsoluteError, PixelErrorCount and PixelErrorPercentage
12+
ICompareResult calcDiff = ImageSharpCompare.CalcDiff("actual.png", "expected.png");
13+
```

‎ImageSharpCompareTestNunit/ImageSharpCompareTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Codeuctivity;
1+
using Codeuctivity.ImageSharpCompare;
22
using NUnit.Framework;
33
using System.IO;
44

‎ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj

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

1111
<ItemGroup>
1212
<PackageReference Include="nunit" Version="3.13.2" />
13-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.32.0.39516">
13+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.35.0.42613">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
17-
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
17+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)