Merge branch 'main' into js/fix-2948

.github/workflows/build-and-test.yml

@@ -77,13 +77,19 @@ jobs:
             sdk-preview: true
             runtime: -x64
             codecov: false
+          - os: macos-26
+            framework: net9.0
+            sdk: 9.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net9.0
             sdk: 9.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
             framework: net9.0
             sdk: 9.0.x
             sdk-preview: true
@@ -100,12 +106,17 @@ jobs:
             sdk: 8.0.x
             runtime: -x64
             codecov: false
+          - os: macos-26
+            framework: net8.0
+            sdk: 8.0.x
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net8.0
             sdk: 8.0.x
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
             framework: net8.0
             sdk: 8.0.x
             runtime: -x64
@@ -124,6 +135,18 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
 
+      - name: Install libgdi+, which is required for tests running on macos
+        if: ${{ contains(matrix.options.os, 'macos-26') }}
+        run: |
+          brew update
+          brew install mono-libgdiplus
+          # Create symlinks to make libgdiplus discoverable
+          sudo mkdir -p /usr/local/lib
+          sudo ln -sf $(brew --prefix)/lib/libgdiplus.dylib /usr/local/lib/libgdiplus.dylib
+          # Verify installation
+          ls -la $(brew --prefix)/lib/libgdiplus* || echo "libgdiplus not found in brew prefix"
+          ls -la /usr/local/lib/libgdiplus* || echo "libgdiplus not found in /usr/local/lib"
+
       - name: Git Config
         shell: bash
         run: |

tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

@@ -360,7 +360,9 @@ public class TiffDecoderTests : TiffDecoderBaseTester
     {
         using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
         image.DebugSave(provider);
-        image.CompareToReferenceOutput(ImageComparer.Exact, provider);
+
+        // ARM reports a 0.0000% difference, so we use a tolerant comparer here.
+        image.CompareToReferenceOutput(ImageComparer.TolerantPercentage(0.0001F), provider);
     }
 
     [Theory]