Skip to content

Commit 1c924f1

Browse files
authored
Bugfix CalcDiff - resizing optional mask on using ResizeOption.Resize
2 parents 7a2c88c + 3325bc9 commit 1c924f1

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/dotnet.yml

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

66
on:
@@ -59,7 +59,7 @@ jobs:
5959
./ImageSharpCompare/bin/Release/*.snupkg
6060
6161
deployTest:
62-
if: github.ref != 'refs/heads/release'
62+
if: github.ref == 'refs/heads/main'
6363
runs-on: ubuntu-latest
6464
needs: build
6565
steps:

ImageSharpCompare/ImageSharpCompare.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>netstandard2.0</TargetFramework>
44
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<RepositoryUrl>https://github.com/Codeuctivity/ImageSharp.Compare</RepositoryUrl>
@@ -43,9 +43,9 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
46+
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.4" />
4747
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
48-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.49.0.57237">
48+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
4949
<PrivateAssets>all</PrivateAssets>
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5151
</PackageReference>

ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
56
<IsPackable>false</IsPackable>
67
<LangVersion>8.0</LangVersion>
78
<Nullable>enable</Nullable>
@@ -14,15 +15,15 @@
1415
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1516
</PackageReference>
1617
<PackageReference Include="nunit" Version="3.13.3" />
17-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.49.0.57237">
18+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
1819
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1920
<PrivateAssets>all</PrivateAssets>
2021
</PackageReference>
21-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
22+
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
2223
<PrivateAssets>all</PrivateAssets>
2324
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2425
</PackageReference>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

0 commit comments

Comments
 (0)