Enhance image comparison features and update dependencies

.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
+{
+	"name": "C# (.NET)",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-dotnettools.csdevkit"
+			]
+		}
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [5000, 5001],
+	// "portsAttributes": {
+	//		"5001": {
+	//			"protocol": "https"
+	//		}
+	// }
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "dotnet restore",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.editorconfig

@@ -1,13 +1,22 @@
-[*.cs]
+[*]
+spelling_exclusion_path = .\exclusion.dic
+
+[*.cs]
 
 # CA1303: Do not pass literals as localized parameters
 dotnet_diagnostic.CA1303.severity = none
 
+# CA2000: Dispose objects before losing scope
+dotnet_diagnostic.CA2000.severity = suggestion
+
 # var preferences
 csharp_style_var_elsewhere = true:warning
 csharp_style_var_for_built_in_types = true:warning
 csharp_style_var_when_type_is_apparent = true:warning
 
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = suggestion
+
 [*.{cs,vb}]
 tab_width=4
 indent_size=4

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [Codeuctivity]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/cla.yml

@@ -11,17 +11,17 @@ 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.6.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
           PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         with:
           path-to-signatures: 'signatures/version1/cla.json'
-          path-to-document: 'https://github.com/Codeuctivity/ImageSharp.Compare/blob/main/cla.md' # e.g. a CLA or a DCO document
+          path-to-document: 'https://github.com/Codeuctivity/SkiaSharp.Compare/blob/main/cla.md' # e.g. a CLA or a DCO document
           # branch should not be protected
           branch: 'cla'
-          allowlist: dependabot[bot],stesee
+          allowlist: dependabot[bot],stesee,github-actions[bot],github-copilot[bot],copilot[bot],copilot-swe-agent[bot],Copilot
 
          #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)

.github/workflows/dotnet.yml

@@ -1,11 +1,15 @@
 name: .NET build and test
 env:
-  CURRENT_VERSION: 0.0.${{ github.run_number }}
+  CURRENT_VERSION: 4.0.${{ github.run_number }}
   LAST_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
 
 on:
   push:
-  pull_request:
+    paths-ignore:
+      - '**.md'
+
+permissions:
+  contents: write
 
 jobs:
   build:
@@ -14,79 +18,104 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: | 
-          6.0.x
+          10.0.x
+    - name: Check formatting
+      run: dotnet format --verify-no-changes
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
+
+    - name: Publish SkiaSharpCompare.Cli (Linux)
+      if: runner.os == 'Linux'
+      run: |
+        dotnet publish SkiaSharpCompare.Cli/SkiaSharpCompare.Cli.csproj -c Release -r linux-x64 --self-contained true -p:PublishSingleFile=true -o ./artifacts/cli/linux-x64
+
+    - name: Publish SkiaSharpCompare.Cli (macOS)
+      if: runner.os == 'macOS'
+      run: |
+        dotnet publish SkiaSharpCompare.Cli/SkiaSharpCompare.Cli.csproj -c Release -r osx-x64 --self-contained true -p:PublishSingleFile=true -o ./artifacts/cli/osx-x64
+
+    - name: Publish SkiaSharpCompare.Cli (Windows)
+      if: runner.os == 'Windows'
+      shell: powershell
+      run: |
+        dotnet publish SkiaSharpCompare.Cli/SkiaSharpCompare.Cli.csproj -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true -o ./artifacts/cli/win-x64
+        dotnet publish SkiaSharpCompare.Cli/SkiaSharpCompare.Cli.csproj -c Release -r win-arm64 --self-contained true -p:PublishSingleFile=true -o ./artifacts/cli/win-arm64
+
+    - name: Upload CLI artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: cli-artifacts-${{ matrix.os }}
+        path: ./artifacts/cli
+        retention-days: 7
+
     - name: Test
       run: dotnet test --no-build --verbosity normal --configuration Release
 
   deployRelease:
-    if: github.ref == 'refs/heads/release'
+    if: startsWith(github.ref, 'refs/heads/release')
     runs-on: ubuntu-latest
-    needs: build 
+    needs: build
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: | 
-          6.0.x
+          10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
+    - name: Download CLI artifacts
+      uses: actions/download-artifact@v8
+      with:
+         path: ./artifacts_download
     - name: NugetPush
       env: 
           NUGET_TOKEN_EXISTS: ${{ secrets.NUGET_TOKEN }}
-      if:  env.NUGET_TOKEN_EXISTS != ''
+      if: env.NUGET_TOKEN_EXISTS != ''
       run: |
-          dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
-    - uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: ${{ env.CURRENT_VERSION }}
-        prerelease: false
-        title: "Release Build"
-        files: |
-          ./SkiaSharpCompare/bin/Release/*.nupkg
-          ./SkiaSharpCompare/bin/Release/*.snupkg
+        dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
+    - name: Github release
+      shell: bash
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      if: env.GITHUB_TOKEN != ''
+      run: |
+          # Attach all downloaded CLI artifacts regardless of OS
+          zip -r cli-artifacts.zip ./artifacts_download
+          gh release create ${{env.CURRENT_VERSION}} ./SkiaSharpCompare/bin/Release/*.*nupkg cli-artifacts.zip --generate-notes
 
   deployTest:
-    if: github.ref != 'refs/heads/release'
+    if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
-    needs: build 
+    needs: build
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: | 
-          6.0.x
+          10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
+    - name: Download CLI artifacts
+      uses: actions/download-artifact@v8
+      with:
+         path: ./artifacts_download
     - name: NugetPush
       env:
           NUGET_TOKEN_EXISTS: ${{ secrets.NUGET_TEST_TOKEN }}
-      if:  env.NUGET_TOKEN_EXISTS != ''
+      if: env.NUGET_TOKEN_EXISTS != ''
       run: |
           ls ./SkiaSharpCompare/bin/Release
-          dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
-    - uses: "marvinpinto/action-automatic-releases@latest"
-      if: github.ref == 'refs/heads/main'
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest-prerelease"
-        prerelease: true
-        title: "Prerelease Build"
-        files: |
-          ./SkiaSharpCompare/bin/Release/*.nupkg
-          ./SkiaSharpCompare/bin/Release/*.snupkg
+          dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v6
+    - uses: actions/stale@v11
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Stale issue message'

.vscode/extensions.json

@@ -2,7 +2,6 @@
     "recommendations": [
         "mhutchie.git-graph",
         "streetsidesoftware.code-spell-checker",
-        "timonwong.shellcheck",
         "redhat.vscode-xml",
         "redhat.vscode-yaml"
     ]

.vscode/launch.json

@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/ImageSharpCompareTestNunit/bin/Debug/net6.0/ImageSharpCompareTestNunit.dll",
+            "program": "${workspaceFolder}/SkiaSharpCompareTestNunit/bin/Debug/net6.0/SkiaSharpCompareTestNunit.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/ImageSharpCompareTestNunit",
+            "cwd": "${workspaceFolder}/SkiaSharpCompareTestNunit",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "internalConsole",
             "stopAtEntry": false

.vscode/settings.json

@@ -1,11 +1,14 @@
 {
-    "cSpell.words": [
-        "Codacy",
-        "Codeuctivity",
-        "Nuget",
-        "Nunit",
-        "Rgba",
-        "nupkg",
-        "snupkg"
-    ]
-}
+  "cSpell.words": [
+    "Codacy",
+    "Codeuctivity",
+    "Diffmask",
+    "Dont",
+    "Nuget",
+    "Nunit",
+    "nupkg",
+    "Rgba",
+    "Skia",
+    "snupkg"
+  ]
+}

.vscode/tasks.json

@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj",
+                "${workspaceFolder}/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj",
+                "${workspaceFolder}/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -32,7 +32,7 @@
             "args": [
                 "watch",
                 "run",
-                "${workspaceFolder}/ImageSharpCompareTestNunit/ImageSharpCompareTestNunit.csproj",
+                "${workspaceFolder}/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -43,6 +43,18 @@
             "type": "shell",
             "command": "'./.vscode/updateNuget.sh'",
             "problemMatcher": []
+        },
+        {
+            "label": "update nuget packages (windows)",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass",
+                "-File",
+                "./.vscode/updateNuget.ps1"
+            ],
+            "problemMatcher": []
         }
     ]
 }

.vscode/updateNuget.ps1

@@ -0,0 +1,23 @@
+# PowerShell script to update NuGet packages in all project files
+# This script finds all .csproj and .fsproj files and updates stable (non-prerelease) packages
+
+$regex = 'PackageReference Include="([^"]*)" Version="([^"]*)"'
+
+Get-ChildItem -Path . -Recurse -Include "*.csproj", "*.fsproj" | ForEach-Object {
+    $projFile = $_.FullName
+    Write-Host "Processing project: $projFile"
+    $content = Get-Content $projFile
+    foreach ($line in $content) {
+        if ($line -match $regex) {
+            $packageName = $matches[1]
+            $version = $matches[2]
+            Write-Host "Found package: $packageName, version: $version"
+
+            # Only update stable versions (not prerelease versions containing -)
+            if ($version -notmatch '-') {
+                Write-Host "Updating package: $packageName"
+                dotnet add "$projFile" package "$packageName"
+            }
+        }
+    }
+}