From 12e668fa341eedf0790b6632adde07e4d9ed80c3 Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Fri, 24 Jun 2022 14:29:33 +0200 Subject: [PATCH 01/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82704b5..dd1b30a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Compares images -[![.github/workflows/dotnet.yml](https://github.com/Codeuctivity/ImageSharp.Compare/actions/workflows/dotnet.yml/badge.svg)](https://github.com/Codeuctivity/ImageSharp.Compare/actions/workflows/dotnet.yml) [![Nuget](https://img.shields.io/nuget/v/Codeuctivity.ImageSharpCompare.svg)](https://www.nuget.org/packages/Codeuctivity.ImageSharpCompare/) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/2fb2807a16f84021b088769e56e1515a)](https://www.codacy.com/gh/Codeuctivity/ImageSharp.Compare/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Codeuctivity/ImageSharp.Compare&utm_campaign=Badge_Grade) [![Donate](https://img.shields.io/static/v1?label=Paypal&message=Donate&color=informational)](https://www.paypal.com/donate?hosted_button_id=7M7UFMMRTS7UE) +[![.github/workflows/dotnet.yml](https://github.com/Codeuctivity/ImageSharp.Compare/actions/workflows/dotnet.yml/badge.svg)](https://github.com/Codeuctivity/ImageSharp.Compare/actions/workflows/dotnet.yml) [![Nuget](https://img.shields.io/nuget/v/Codeuctivity.ImageSharpCompare.svg)](https://www.nuget.org/packages/Codeuctivity.ImageSharpCompare/) [![Donate](https://img.shields.io/static/v1?label=Paypal&message=Donate&color=informational)](https://www.paypal.com/donate?hosted_button_id=7M7UFMMRTS7UE) Inspired by the image compare feature "Visual verification API" of [TestApi](https://blogs.msdn.microsoft.com/ivo_manolov/2009/04/20/introduction-to-testapi-part-3-visual-verification-apis/) this code supports comparing images by using a tolerance mask image. That tolerance mask image is a valid image by itself and can be manipulated. From 1147b54ce6fa19373532a1905eec1335b5061e0f Mon Sep 17 00:00:00 2001 From: Stefan Seeland Date: Sun, 26 Jun 2022 12:01:10 +0200 Subject: [PATCH 02/15] Update ImageSharpCompareTest.cs --- .../ImageSharpCompareTest.cs | 80 ++++++++++++++----- 1 file changed, 59 insertions(+), 21 deletions(-) diff --git a/ImageSharpCompareTestNunit/ImageSharpCompareTest.cs b/ImageSharpCompareTestNunit/ImageSharpCompareTest.cs index 519eaf7..289dc20 100644 --- a/ImageSharpCompareTestNunit/ImageSharpCompareTest.cs +++ b/ImageSharpCompareTestNunit/ImageSharpCompareTest.cs @@ -41,8 +41,8 @@ public void ShouldVerifyThatImagesSizeAreEqual(string pathActual, string pathExp var absolutePathActual = Path.Combine(AppContext.BaseDirectory, pathActual); var absolutePathExpected = Path.Combine(AppContext.BaseDirectory, pathExpected); - using var actual = SixLabors.ImageSharp.Image.Load(absolutePathActual); - using var expected = SixLabors.ImageSharp.Image.Load(absolutePathExpected); + using var actual = Image.Load(absolutePathActual); + using var expected = Image.Load(absolutePathExpected); Assert.That(ImageSharpCompare.ImagesHaveEqualSize(absolutePathActual, absolutePathExpected), Is.EqualTo(expectedOutcome)); } @@ -101,23 +101,8 @@ public void ShouldVerifyThatImageSharpImagesAreEqual(string pathActual, string p using var expected = Image.Load(absolutePathExpected); Assert.That(ImageSharpCompare.ImagesAreEqual(actual, expected), Is.True); - - var isActualDiposed = (bool?)GetInstanceField(actual, "isDisposed"); - var isExpectedDiposed = (bool?)GetInstanceField(expected, "isDisposed"); - Assert.That(isActualDiposed, Is.False); - Assert.That(isExpectedDiposed, Is.False); - } - - private static object? GetInstanceField(T instance, string fieldName) - { - var bindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static; - var field = typeof(T).GetField(fieldName, bindFlags); - if (field == null) - { - throw new ArgumentNullException(fieldName); - } - - return field.GetValue(instance); + AssertDisposeBehavior(actual); + AssertDisposeBehavior(expected); } [Test] @@ -164,7 +149,7 @@ public void ShouldVerifyThatImageStreamsAreSemiEqual(string pathPic1, string pat } [TestCase(png0Rgba32, png1Rgba32, 0, 0, 0, 0)] - public void Diffmask(string pathPic1, string pathPic2, int expectedMeanError, int expectedAbsoluteError, int expectedPixelErrorCount, double expectedPixelErrorPercentage) + public void ShoulCalcDiffmask(string pathPic1, string pathPic2, int expectedMeanError, int expectedAbsoluteError, int expectedPixelErrorCount, double expectedPixelErrorPercentage) { var absolutePathPic1 = Path.Combine(AppContext.BaseDirectory, pathPic1); var absolutePathPic2 = Path.Combine(AppContext.BaseDirectory, pathPic2); @@ -173,7 +158,7 @@ public void Diffmask(string pathPic1, string pathPic2, int expectedMeanError, in using (var fileStreamDifferenceMask = File.Create(differenceMask)) using (var maskImage = ImageSharpCompare.CalcDiffMaskImage(absolutePathPic1, absolutePathPic2)) { - SixLabors.ImageSharp.ImageExtensions.SaveAsPng(maskImage, fileStreamDifferenceMask); + ImageExtensions.SaveAsPng(maskImage, fileStreamDifferenceMask); } var maskedDiff = ImageSharpCompare.CalcDiff(absolutePathPic1, absolutePathPic2, differenceMask); @@ -185,6 +170,59 @@ public void Diffmask(string pathPic1, string pathPic2, int expectedMeanError, in Assert.That(maskedDiff.PixelErrorPercentage, Is.EqualTo(expectedPixelErrorPercentage), "PixelErrorPercentage"); } + [TestCase(png0Rgba32, png1Rgba32, 0, 0, 0, 0)] + [TestCase(jpg0Rgb24, jpg1Rgb24, 0, 0, 0, 0)] + public void ShoulCalcDiffmaskImageSharp(string pathPic1, string pathPic2, int expectedMeanError, int expectedAbsoluteError, int expectedPixelErrorCount, double expectedPixelErrorPercentage) + { + var absolutePathPic1 = Path.Combine(AppContext.BaseDirectory, pathPic1); + var absolutePathPic2 = Path.Combine(AppContext.BaseDirectory, pathPic2); + var differenceMaskPicPath = Path.GetTempFileName() + "differenceMask.png"; + + using var absolutePic1 = Image.Load(absolutePathPic1); + using var absolutePic2 = Image.Load(absolutePathPic2); + + using (var fileStreamDifferenceMask = File.Create(differenceMaskPicPath)) + using (var maskImage = ImageSharpCompare.CalcDiffMaskImage(absolutePic1, absolutePic2)) + { + ImageExtensions.SaveAsPng(maskImage, fileStreamDifferenceMask); + } + + using var differenceMaskPic = Image.Load(differenceMaskPicPath); + var maskedDiff = ImageSharpCompare.CalcDiff(absolutePic1, absolutePic2, differenceMaskPic); + File.Delete(differenceMaskPicPath); + + Assert.That(maskedDiff.AbsoluteError, Is.EqualTo(expectedAbsoluteError), "AbsoluteError"); + Assert.That(maskedDiff.MeanError, Is.EqualTo(expectedMeanError), "MeanError"); + Assert.That(maskedDiff.PixelErrorCount, Is.EqualTo(expectedPixelErrorCount), "PixelErrorCount"); + Assert.That(maskedDiff.PixelErrorPercentage, Is.EqualTo(expectedPixelErrorPercentage), "PixelErrorPercentage"); + + AssertDisposeBehavior(absolutePic1); + AssertDisposeBehavior(absolutePic2); + AssertDisposeBehavior(differenceMaskPic); + } + + private void AssertDisposeBehavior(Image image) + { + const string imageSharpPrivateFieldNameIsDisposed = "isDisposed"; + var isDisposed = (bool?)GetInstanceField(image, imageSharpPrivateFieldNameIsDisposed); + Assert.That(isDisposed, Is.False); + image.Dispose(); + isDisposed = (bool?)GetInstanceField(image, imageSharpPrivateFieldNameIsDisposed); + Assert.That(isDisposed, Is.True); + } + + private static object? GetInstanceField(T instance, string fieldName) + { + var bindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static; + var field = typeof(T).GetField(fieldName, bindFlags); + if (field == null) + { + throw new ArgumentNullException(fieldName); + } + + return field.GetValue(instance); + } + [TestCase(png0Rgba32, png1Rgba32, 0, 0, 0, 0)] public void DiffmaskSteams(string pathPic1, string pathPic2, int expectedMeanError, int expectedAbsoluteError, int expectedPixelErrorCount, double expectedPixelErrorPercentage) { From 06d84b04f8bdb3549fbad78add9ef2abb24f4f99 Mon Sep 17 00:00:00 2001 From: Sergey Nechaev <6499856+snechaev@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:33:33 +0700 Subject: [PATCH 03/15] README - add note about ignoring alpha --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dd1b30a..6e29c01 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ Inspired by the image compare feature "Visual verification API" of [TestApi](htt ImageSharpCompare focus on os agnostic support and therefore depends on [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp). +**NOTE**: for now the comparer will only work with **RGB** components and totally ignores **A**lpha-channell. + ## Example simple show cases ```csharp From 4565c3000880a908ea9df286cd8648714870813f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 09:40:01 +0000 Subject: [PATCH 04/15] @snechaev has signed the CLA from Pull Request #39 --- signatures/version1/cla.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/signatures/version1/cla.json b/signatures/version1/cla.json index 39685c5..6245d65 100644 --- a/signatures/version1/cla.json +++ b/signatures/version1/cla.json @@ -15,6 +15,14 @@ "created_at": "2022-06-22T21:12:05Z", "repoId": 216339629, "pullRequestNo": 36 + }, + { + "name": "snechaev", + "id": 6499856, + "comment_id": 1190056766, + "created_at": "2022-07-20T09:39:43Z", + "repoId": 216339629, + "pullRequestNo": 39 } ] } \ No newline at end of file From 8da1174a9dc58192a1b8967f5518933508b119f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 17:12:43 +0000 Subject: [PATCH 05/15] Bump cla-assistant/github-action from 2.1.3.pre.beta to 2.2.0 Bumps [cla-assistant/github-action](https://github.com/cla-assistant/github-action) from 2.1.3.pre.beta to 2.2.0. - [Release notes](https://github.com/cla-assistant/github-action/releases) - [Changelog](https://github.com/contributor-assistant/github-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/cla-assistant/github-action/compare/v2.1.3-beta...v2.2.0) --- updated-dependencies: - dependency-name: cla-assistant/github-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/cla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 8409962..c582287 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -12,7 +12,7 @@ jobs: - name: "CLA Assistant" if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' # Beta Release - uses: cla-assistant/github-action@v2.1.3-beta + uses: cla-assistant/github-action@v2.2.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # the below token should have repo scope and must be manually added by you in the repository's secret From 6a5aa704349891db28822b665999a7ce56071360 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:14:24 +0000 Subject: [PATCH 06/15] Bump cla-assistant/github-action from 2.2.0 to 2.2.1 Bumps [cla-assistant/github-action](https://github.com/cla-assistant/github-action) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/cla-assistant/github-action/releases) - [Changelog](https://github.com/contributor-assistant/github-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/cla-assistant/github-action/compare/v2.2.0...v2.2.1) --- updated-dependencies: - dependency-name: cla-assistant/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/cla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index c582287..12cdf8b 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -12,7 +12,7 @@ jobs: - name: "CLA Assistant" if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' # Beta Release - uses: cla-assistant/github-action@v2.2.0 + uses: cla-assistant/github-action@v2.2.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # the below token should have repo scope and must be manually added by you in the repository's secret From b530fd27eed7fb44bee94fe7066893f9d2892447 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 17:11:50 +0000 Subject: [PATCH 07/15] Bump actions/stale from 5 to 6 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 6. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 9492504..655d659 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v6 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'Stale issue message' From 7ea2231636dfaaf3712719fe99d62503c43ea55b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 17:13:58 +0000 Subject: [PATCH 08/15] Bump actions/setup-dotnet from 2 to 3 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 2 to 3. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8594478..db774d8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 6.0.x @@ -34,7 +34,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 6.0.x @@ -65,7 +65,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 6.0.x From 9461238f886ba4209186675ecc0392f2372d00db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 17:12:41 +0000 Subject: [PATCH 09/15] Bump coverlet.collector from 3.1.2 to 3.2.0 Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/commits/v3.2.0) --- updated-dependencies: - dependency-name: coverlet.collector dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj b/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj index b869bda..2a2ad76 100644 --- a/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj +++ b/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From b5536fe6be81aa6c61b10c0c84c98bd990b4fb69 Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Wed, 30 Nov 2022 02:07:51 +0100 Subject: [PATCH 10/15] Excluded coverlet.collector from dependabot --- .github/dependabot.yml | 1 + .github/workflows/cla.yml | 7 +++---- ImageSharpCompare.sln | 3 +++ ImageSharpCompare/ImageSharpCompare.csproj | 2 +- .../ImageSharpCompareTestNunit.csproj | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3de8dae..98e5584 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -29,6 +29,7 @@ updates: interval: "daily" ignore: - dependency-name: "nunit" + - dependency-name: "coverlet.collector" - dependency-name: "SonarAnalyzer.CSharp" - dependency-name: "AngleSharp" - dependency-name: "Microsoft.NET.Test.Sdk" diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 12cdf8b..c38e82b 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -11,7 +11,6 @@ jobs: steps: - name: "CLA Assistant" if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - # Beta Release uses: cla-assistant/github-action@v2.2.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -19,10 +18,10 @@ jobs: PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} with: path-to-signatures: 'signatures/version1/cla.json' - path-to-document: 'https://github.com/Codeuctivity/ImageSharp.Compare/cla.md' # e.g. a CLA or a DCO document + path-to-document: 'https://github.com/Codeuctivity/ImageSharp.Compare/blob/main/cla.md' # e.g. a CLA or a DCO document # branch should not be protected - branch: 'main' - allowlist: dependabot[bot] + branch: 'cla' + allowlist: dependabot[bot],stesee #below are the optional inputs - If the optional inputs are not given, then default values will be taken #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) diff --git a/ImageSharpCompare.sln b/ImageSharpCompare.sln index 3816903..70e605e 100644 --- a/ImageSharpCompare.sln +++ b/ImageSharpCompare.sln @@ -10,8 +10,11 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A1B6F6C3-ECBE-471C-AE18-199DEF5982C3}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + .github\workflows\cla.yml = .github\workflows\cla.yml + .github\dependabot.yml = .github\dependabot.yml .github\workflows\dotnet.yml = .github\workflows\dotnet.yml README.md = README.md + .github\workflows\stale.yml = .github\workflows\stale.yml EndProjectSection EndProject Global diff --git a/ImageSharpCompare/ImageSharpCompare.csproj b/ImageSharpCompare/ImageSharpCompare.csproj index cd8bf1c..5b9867b 100644 --- a/ImageSharpCompare/ImageSharpCompare.csproj +++ b/ImageSharpCompare/ImageSharpCompare.csproj @@ -48,7 +48,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj b/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj index 2a2ad76..a4571d4 100644 --- a/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj +++ b/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj @@ -15,15 +15,15 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From a8ed8d46bf4e0f213608b0f6e18308d21e2f4dc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 17:02:48 +0000 Subject: [PATCH 11/15] Bump actions/stale from 6 to 7 Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 655d659..9d5c088 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v6 + - uses: actions/stale@v7 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'Stale issue message' From b0e1d5f714e07902035d60fc88bda02c0ef2cfdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 17:58:08 +0000 Subject: [PATCH 12/15] Bump cla-assistant/github-action from 2.2.1 to 2.3.0 Bumps [cla-assistant/github-action](https://github.com/cla-assistant/github-action) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/cla-assistant/github-action/releases) - [Commits](https://github.com/cla-assistant/github-action/compare/v2.2.1...v2.3.0) --- updated-dependencies: - dependency-name: cla-assistant/github-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/cla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index c38e82b..50d186e 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -11,7 +11,7 @@ jobs: steps: - name: "CLA Assistant" if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: cla-assistant/github-action@v2.2.1 + uses: cla-assistant/github-action@v2.3.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # the below token should have repo scope and must be manually added by you in the repository's secret From 1e0e31b896d40ee5c060ed255d009b7fb60c810a Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 2 Mar 2023 07:46:17 +1100 Subject: [PATCH 13/15] update to ImageSharp 3.0 --- ImageSharpCompare/ImageSharpCompare.csproj | 4 ++-- ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ImageSharpCompare/ImageSharpCompare.csproj b/ImageSharpCompare/ImageSharpCompare.csproj index 5b9867b..2c9dfd1 100644 --- a/ImageSharpCompare/ImageSharpCompare.csproj +++ b/ImageSharpCompare/ImageSharpCompare.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0 + net6.0 true true https://github.com/Codeuctivity/ImageSharp.Compare @@ -46,7 +46,7 @@ - + all diff --git a/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj b/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj index a4571d4..60a79eb 100644 --- a/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj +++ b/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj @@ -1,8 +1,7 @@  - net472;net6.0 - net6.0 + net6.0 false 8.0 enable From f9cecd66cb96b12ee0ced655110547d11a7c1ca6 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 2 Mar 2023 07:47:37 +1100 Subject: [PATCH 14/15] Update ImageSharpCompare.csproj --- ImageSharpCompare/ImageSharpCompare.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ImageSharpCompare/ImageSharpCompare.csproj b/ImageSharpCompare/ImageSharpCompare.csproj index 2c9dfd1..bf0525a 100644 --- a/ImageSharpCompare/ImageSharpCompare.csproj +++ b/ImageSharpCompare/ImageSharpCompare.csproj @@ -34,10 +34,7 @@ Codeuctivity.ImageSharpCompare true - - True - - + True From 7d7b0c5c07a27d80814759d8b2c2c36acdb27739 Mon Sep 17 00:00:00 2001 From: Stefan Seeland <168659+stesee@users.noreply.github.com> Date: Sat, 4 Mar 2023 09:17:16 +0100 Subject: [PATCH 15/15] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index db774d8..5beec00 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,6 +1,6 @@ name: .NET build and test env: - CURRENT_VERSION: 2.0.${{ github.run_number }} + CURRENT_VERSION: 3.0.${{ github.run_number }} LAST_COMMIT_MESSAGE: ${{ github.event.head_commit.message }} on: