diff --git a/.gitattributes b/.gitattributes
index 031420e53..4b946243c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -110,6 +110,7 @@
 ###############################################################################
 # Handle image files by git lfs
 ###############################################################################
+*.pdf               filter=lfs diff=lfs merge=lfs -text
 *.jpg               filter=lfs diff=lfs merge=lfs -text
 *.jpeg              filter=lfs diff=lfs merge=lfs -text
 *.bmp               filter=lfs diff=lfs merge=lfs -text
@@ -137,6 +138,10 @@
 *.heic              filter=lfs diff=lfs merge=lfs -text
 *.hif               filter=lfs diff=lfs merge=lfs -text
 *.avif              filter=lfs diff=lfs merge=lfs -text
+*.hvc1              filter=lfs diff=lfs merge=lfs -text
+*.hvcc              filter=lfs diff=lfs merge=lfs -text
+*.yuv               filter=lfs diff=lfs merge=lfs -text
+*.bit               filter=lfs diff=lfs merge=lfs -text
 ###############################################################################
 # Handle ICC files by git lfs
 ###############################################################################
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f814db626..2b3fa1760 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,7 +24,7 @@
 
  * When first cloning the repo, make sure to run `git submodule update --init --recursive` otherwise the submodules (e.g. `shared-infrastructure`) will be missing.
 
- * Run `dotnet build` in the root of the repo, or open the ImageSharp.Drawing.sln file in Visual Studio and build from there.
+ * Run `dotnet build` in the root of the repo, or open the ImageSharp.Drawing.slnx file in Visual Studio and build from there.
 
 #### **Running tests and Debugging**
 
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index bb2eb411d..b04578570 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -64,48 +64,48 @@ jobs:
       matrix:
         options:
           - os: ubuntu-latest
-            framework: net10.0
-            sdk: 10.0.x
+            framework: net11.0
+            sdk: 11.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: macos-26
-            framework: net10.0
-            sdk: 10.0.x
+            framework: net11.0
+            sdk: 11.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: net10.0
-            sdk: 10.0.x
+            framework: net11.0
+            sdk: 11.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: ubuntu-22.04-arm
-            framework: net10.0
-            sdk: 10.0.x
+            framework: net11.0
+            sdk: 11.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
 
           - os: ubuntu-latest
-            framework: net8.0
-            sdk: 8.0.x
+            framework: net10.0
+            sdk: 10.0.x
             runtime: -x64
             codecov: false
           - os: macos-26
-            framework: net8.0
-            sdk: 8.0.x
+            framework: net10.0
+            sdk: 10.0.x
             runtime: -x64
             codecov: true
           - os: windows-latest
-            framework: net8.0
-            sdk: 8.0.x
+            framework: net10.0
+            sdk: 10.0.x
             runtime: -x64
             codecov: false
           - os: ubuntu-22.04-arm
-            framework: net8.0
-            sdk: 8.0.x
+            framework: net10.0
+            sdk: 10.0.x
             runtime: -x64
             codecov: false
 
@@ -169,14 +169,15 @@ jobs:
         uses: actions/setup-dotnet@v6
         with:
           dotnet-version: |
-            8.0.x
+            10.0.x
 
       - name: DotNet Setup Preview
         if: ${{ matrix.options.sdk-preview == true }}
         uses: actions/setup-dotnet@v6
         with:
+          dotnet-quality: preview
           dotnet-version: |
-            10.0.x
+            11.0.x
 
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}
diff --git a/ImageSharp.Drawing.All.sln b/ImageSharp.Drawing.All.sln
deleted file mode 100644
index 7b317194c..000000000
--- a/ImageSharp.Drawing.All.sln
+++ /dev/null
@@ -1,522 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.0.11123.170
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		.gitmodules = .gitmodules
-		ci-build.ps1 = ci-build.ps1
-		ci-pack.ps1 = ci-pack.ps1
-		ci-test.ps1 = ci-test.ps1
-		codecov.yml = codecov.yml
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		LICENSE = LICENSE
-		README.md = README.md
-		THIRD-PARTY-NOTICES = THIRD-PARTY-NOTICES
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1799C43E-5C54-4A8F-8D64-B1475241DB0D}"
-	ProjectSection(SolutionItems) = preProject
-		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
-		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{FBE8C1AD-5AEC-4514-9B64-091D8E145865}"
-	ProjectSection(SolutionItems) = preProject
-		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
-		.github\ISSUE_TEMPLATE\oss-bug-report.yml = .github\ISSUE_TEMPLATE\oss-bug-report.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-		src\Directory.Build.targets = src\Directory.Build.targets
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{2E33181E-6E28-4662-A801-E2E7DC206029}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56801022-D71A-4FBE-BC5B-CBA08E2284EC}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Directory.Build.props = tests\Directory.Build.props
-		tests\Directory.Build.targets = tests\Directory.Build.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{FA55F5DE-11A6-487D-ABA4-BC93A02717DD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Input", "Input", "{9DA226A1-8656-49A8-A58A-A8B5C081AD66}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bmp", "Bmp", "{1A82C5F6-90E0-4E97-BE16-A825C046B493}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Bmp\BitmapCoreHeaderQR.bmp = tests\Images\Input\Bmp\BitmapCoreHeaderQR.bmp
-		tests\Images\Input\Bmp\BITMAPV5HEADER.bmp = tests\Images\Input\Bmp\BITMAPV5HEADER.bmp
-		tests\Images\Input\Bmp\Car.bmp = tests\Images\Input\Bmp\Car.bmp
-		tests\Images\Input\Bmp\F.bmp = tests\Images\Input\Bmp\F.bmp
-		tests\Images\Input\Bmp\issue735.bmp = tests\Images\Input\Bmp\issue735.bmp
-		tests\Images\Input\Bmp\neg_height.bmp = tests\Images\Input\Bmp\neg_height.bmp
-		tests\Images\Input\Bmp\pal1.bmp = tests\Images\Input\Bmp\pal1.bmp
-		tests\Images\Input\Bmp\pal1p1.bmp = tests\Images\Input\Bmp\pal1p1.bmp
-		tests\Images\Input\Bmp\pal4.bmp = tests\Images\Input\Bmp\pal4.bmp
-		tests\Images\Input\Bmp\pal4rle.bmp = tests\Images\Input\Bmp\pal4rle.bmp
-		tests\Images\Input\Bmp\pal8-0.bmp = tests\Images\Input\Bmp\pal8-0.bmp
-		tests\Images\Input\Bmp\pal8gs.bmp = tests\Images\Input\Bmp\pal8gs.bmp
-		tests\Images\Input\Bmp\pal8offs.bmp = tests\Images\Input\Bmp\pal8offs.bmp
-		tests\Images\Input\Bmp\pal8os2sp.bmp = tests\Images\Input\Bmp\pal8os2sp.bmp
-		tests\Images\Input\Bmp\pal8os2v1_winv2.bmp = tests\Images\Input\Bmp\pal8os2v1_winv2.bmp
-		tests\Images\Input\Bmp\pal8os2v2-16.bmp = tests\Images\Input\Bmp\pal8os2v2-16.bmp
-		tests\Images\Input\Bmp\pal8os2v2.bmp = tests\Images\Input\Bmp\pal8os2v2.bmp
-		tests\Images\Input\Bmp\pal8v4.bmp = tests\Images\Input\Bmp\pal8v4.bmp
-		tests\Images\Input\Bmp\pal8v5.bmp = tests\Images\Input\Bmp\pal8v5.bmp
-		tests\Images\Input\Bmp\rgb16-565.bmp = tests\Images\Input\Bmp\rgb16-565.bmp
-		tests\Images\Input\Bmp\rgb16-565pal.bmp = tests\Images\Input\Bmp\rgb16-565pal.bmp
-		tests\Images\Input\Bmp\rgb16.bmp = tests\Images\Input\Bmp\rgb16.bmp
-		tests\Images\Input\Bmp\rgb16bfdef.bmp = tests\Images\Input\Bmp\rgb16bfdef.bmp
-		tests\Images\Input\Bmp\rgb24.bmp = tests\Images\Input\Bmp\rgb24.bmp
-		tests\Images\Input\Bmp\rgb32.bmp = tests\Images\Input\Bmp\rgb32.bmp
-		tests\Images\Input\Bmp\rgb32bf.bmp = tests\Images\Input\Bmp\rgb32bf.bmp
-		tests\Images\Input\Bmp\rgb32bfdef.bmp = tests\Images\Input\Bmp\rgb32bfdef.bmp
-		tests\Images\Input\Bmp\rgba32-1010102.bmp = tests\Images\Input\Bmp\rgba32-1010102.bmp
-		tests\Images\Input\Bmp\rgba32.bmp = tests\Images\Input\Bmp\rgba32.bmp
-		tests\Images\Input\Bmp\rgba32abf.bmp = tests\Images\Input\Bmp\rgba32abf.bmp
-		tests\Images\Input\Bmp\rgba32h56.bmp = tests\Images\Input\Bmp\rgba32h56.bmp
-		tests\Images\Input\Bmp\RunLengthEncoded-inverted.bmp = tests\Images\Input\Bmp\RunLengthEncoded-inverted.bmp
-		tests\Images\Input\Bmp\RunLengthEncoded.bmp = tests\Images\Input\Bmp\RunLengthEncoded.bmp
-		tests\Images\Input\Bmp\test16-inverted.bmp = tests\Images\Input\Bmp\test16-inverted.bmp
-		tests\Images\Input\Bmp\test16.bmp = tests\Images\Input\Bmp\test16.bmp
-		tests\Images\Input\Bmp\test8-inverted.bmp = tests\Images\Input\Bmp\test8-inverted.bmp
-		tests\Images\Input\Bmp\test8.bmp = tests\Images\Input\Bmp\test8.bmp
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gif", "Gif", "{EE3FB0B3-1C31-41E9-93AB-BA800560A868}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Gif\base_1x4.gif = tests\Images\Input\Gif\base_1x4.gif
-		tests\Images\Input\Gif\base_4x1.gif = tests\Images\Input\Gif\base_4x1.gif
-		tests\Images\Input\Gif\cheers.gif = tests\Images\Input\Gif\cheers.gif
-		tests\Images\Input\Gif\giphy.gif = tests\Images\Input\Gif\giphy.gif
-		tests\Images\Input\Gif\kumin.gif = tests\Images\Input\Gif\kumin.gif
-		tests\Images\Input\Gif\leo.gif = tests\Images\Input\Gif\leo.gif
-		tests\Images\Input\Gif\rings.gif = tests\Images\Input\Gif\rings.gif
-		tests\Images\Input\Gif\trans.gif = tests\Images\Input\Gif\trans.gif
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "issues", "issues", "{BF8DFDC1-CEE5-4A37-B216-D3085360C776}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Gif\issues\issue403_baddescriptorwidth.gif = tests\Images\Input\Gif\issues\issue403_baddescriptorwidth.gif
-		tests\Images\Input\Gif\issues\issue405_badappextlength252-2.gif = tests\Images\Input\Gif\issues\issue405_badappextlength252-2.gif
-		tests\Images\Input\Gif\issues\issue405_badappextlength252.gif = tests\Images\Input\Gif\issues\issue405_badappextlength252.gif
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jpg", "Jpg", "{DB21FED7-E8CB-4B00-9EB2-9144D32A590A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "baseline", "baseline", "{195BA3D3-3E9F-4BC5-AB40-5F9FEB638146}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\baseline\AsianCarvingLowContrast.jpg = tests\Images\Input\Jpg\baseline\AsianCarvingLowContrast.jpg
-		tests\Images\Input\Jpg\baseline\badeof.jpg = tests\Images\Input\Jpg\baseline\badeof.jpg
-		tests\Images\Input\Jpg\baseline\badrst.jpg = tests\Images\Input\Jpg\baseline\badrst.jpg
-		tests\Images\Input\Jpg\baseline\Calliphora.jpg = tests\Images\Input\Jpg\baseline\Calliphora.jpg
-		tests\Images\Input\Jpg\baseline\cmyk.jpg = tests\Images\Input\Jpg\baseline\cmyk.jpg
-		tests\Images\Input\Jpg\baseline\exif.jpg = tests\Images\Input\Jpg\baseline\exif.jpg
-		tests\Images\Input\Jpg\baseline\Floorplan.jpg = tests\Images\Input\Jpg\baseline\Floorplan.jpg
-		tests\Images\Input\Jpg\baseline\gamma_dalai_lama_gray.jpg = tests\Images\Input\Jpg\baseline\gamma_dalai_lama_gray.jpg
-		tests\Images\Input\Jpg\baseline\Hiyamugi.jpg = tests\Images\Input\Jpg\baseline\Hiyamugi.jpg
-		tests\Images\Input\Jpg\baseline\jpeg400jfif.jpg = tests\Images\Input\Jpg\baseline\jpeg400jfif.jpg
-		tests\Images\Input\Jpg\baseline\jpeg420exif.jpg = tests\Images\Input\Jpg\baseline\jpeg420exif.jpg
-		tests\Images\Input\Jpg\baseline\jpeg420small.jpg = tests\Images\Input\Jpg\baseline\jpeg420small.jpg
-		tests\Images\Input\Jpg\baseline\jpeg444.jpg = tests\Images\Input\Jpg\baseline\jpeg444.jpg
-		tests\Images\Input\Jpg\baseline\Lake.jpg = tests\Images\Input\Jpg\baseline\Lake.jpg
-		tests\Images\Input\Jpg\baseline\MultiScanBaselineCMYK.jpg = tests\Images\Input\Jpg\baseline\MultiScanBaselineCMYK.jpg
-		tests\Images\Input\Jpg\baseline\ratio-1x1.jpg = tests\Images\Input\Jpg\baseline\ratio-1x1.jpg
-		tests\Images\Input\Jpg\baseline\Snake.jpg = tests\Images\Input\Jpg\baseline\Snake.jpg
-		tests\Images\Input\Jpg\baseline\testimgint.jpg = tests\Images\Input\Jpg\baseline\testimgint.jpg
-		tests\Images\Input\Jpg\baseline\testorig.jpg = tests\Images\Input\Jpg\baseline\testorig.jpg
-		tests\Images\Input\Jpg\baseline\testorig12.jpg = tests\Images\Input\Jpg\baseline\testorig12.jpg
-		tests\Images\Input\Jpg\baseline\turtle.jpg = tests\Images\Input\Jpg\baseline\turtle.jpg
-		tests\Images\Input\Jpg\baseline\ycck-subsample-1222.jpg = tests\Images\Input\Jpg\baseline\ycck-subsample-1222.jpg
-		tests\Images\Input\Jpg\baseline\ycck.jpg = tests\Images\Input\Jpg\baseline\ycck.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{538F0EBD-4084-4EDB-93DD-6D35B733CA48}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\badeof.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\badeof.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\badrst.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\badrst.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Calliphora.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Calliphora.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\cmyk.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\cmyk.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\exif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\exif.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Floorplan.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Floorplan.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\gamma_dalai_lama_gray.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\gamma_dalai_lama_gray.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Hiyamugi.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Hiyamugi.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg400jfif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg400jfif.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420exif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420exif.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420small.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420small.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg444.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg444.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Lake.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Lake.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\MultiScanBaselineCMYK.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\MultiScanBaselineCMYK.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\ratio-1x1.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\ratio-1x1.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Snake.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Snake.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\testimgint.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\testimgint.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\testorig.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\testorig.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\turtle.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\turtle.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\ycck.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\ycck.jpg.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "issues", "issues", "{5C9B689F-B96D-47BE-A208-C23B1B2A8570}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Bedroom.jpg = tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Bedroom.jpg
-		tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Girl.jpg = tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Girl.jpg
-		tests\Images\Input\Jpg\issues\Issue178-BadCoeffsProgressive-Lemon.jpg = tests\Images\Input\Jpg\issues\Issue178-BadCoeffsProgressive-Lemon.jpg
-		tests\Images\Input\Jpg\issues\Issue214-CriticalEOF.jpg = tests\Images\Input\Jpg\issues\Issue214-CriticalEOF.jpg
-		tests\Images\Input\Jpg\issues\Issue385-BadZigZag-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue385-BadZigZag-Progressive.jpg
-		tests\Images\Input\Jpg\issues\Issue394-MultiHuffmanBaseline-Speakers.jpg = tests\Images\Input\Jpg\issues\Issue394-MultiHuffmanBaseline-Speakers.jpg
-		tests\Images\Input\Jpg\issues\Issue517-No-EOI-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue517-No-EOI-Progressive.jpg
-		tests\Images\Input\Jpg\issues\Issue518-Bad-RST-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue518-Bad-RST-Progressive.jpg
-		tests\Images\Input\Jpg\issues\Issue520-InvalidCast.jpg = tests\Images\Input\Jpg\issues\Issue520-InvalidCast.jpg
-		tests\Images\Input\Jpg\issues\Issue624-DhtHasWrongLength-Progressive-N.jpg = tests\Images\Input\Jpg\issues\Issue624-DhtHasWrongLength-Progressive-N.jpg
-		tests\Images\Input\Jpg\issues\Issue694-Decode-Exif-OutOfRange.jpg = tests\Images\Input\Jpg\issues\Issue694-Decode-Exif-OutOfRange.jpg
-		tests\Images\Input\Jpg\issues\Issue695-Invalid-EOI.jpg = tests\Images\Input\Jpg\issues\Issue695-Invalid-EOI.jpg
-		tests\Images\Input\Jpg\issues\Issue696-Resize-Exif-OutOfRange.jpg = tests\Images\Input\Jpg\issues\Issue696-Resize-Exif-OutOfRange.jpg
-		tests\Images\Input\Jpg\issues\Issue721-InvalidAPP0.jpg = tests\Images\Input\Jpg\issues\Issue721-InvalidAPP0.jpg
-		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-A.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-A.jpg
-		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-B.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-B.jpg
-		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-C.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-C.jpg
-		tests\Images\Input\Jpg\issues\issue750-exif-load.jpg = tests\Images\Input\Jpg\issues\issue750-exif-load.jpg
-		tests\Images\Input\Jpg\issues\issue750-exif-tranform.jpg = tests\Images\Input\Jpg\issues\issue750-exif-tranform.jpg
-		tests\Images\Input\Jpg\issues\Issue845-Incorrect-Quality99.jpg = tests\Images\Input\Jpg\issues\Issue845-Incorrect-Quality99.jpg
-		tests\Images\Input\Jpg\issues\issue855-incorrect-colorspace.jpg = tests\Images\Input\Jpg\issues\issue855-incorrect-colorspace.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fuzz", "fuzz", "{516A3532-6AC2-417B-AD79-9BD5D0D378A0}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\issues\fuzz\Issue797-NullReferenceException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue797-NullReferenceException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue798-AccessViolationException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue798-AccessViolationException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue821-DivideByZeroException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue821-DivideByZeroException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue822-DivideByZeroException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue822-DivideByZeroException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue823-NullReferenceException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue823-NullReferenceException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-A.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-B.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-C.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-D.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-D.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-E.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-E.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-F.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-F.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-G.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-G.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-H.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-H.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-A.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-B.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-C.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-D.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-D.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-A.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-B.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-C.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue827-AccessViolationException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue827-AccessViolationException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue839-ExecutionEngineException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue839-ExecutionEngineException.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{714CDEA1-9AE6-4F76-B8B1-A7DB8C1DB82F}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Bedroom.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Bedroom.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Girl.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Girl.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue178-BadCoeffsProgressive-Lemon.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue178-BadCoeffsProgressive-Lemon.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue214-CriticalEOF .jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue214-CriticalEOF .jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue385-BadZigZag-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue385-BadZigZag-Progressive.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue394-MultiHuffmanBaseline-Speakers.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue394-MultiHuffmanBaseline-Speakers.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue517-No-EOI-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue517-No-EOI-Progressive.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue518-Bad-RST-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue518-Bad-RST-Progressive.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue520-InvalidCast.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue520-InvalidCast.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue624-DhtHasWrongLength-Progressive-N.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue624-DhtHasWrongLength-Progressive-N.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue694-Decode-Exif-OutOfRange.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue694-Decode-Exif-OutOfRange.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue695-Invalid-EOI.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue695-Invalid-EOI.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue696-Resize-Exif-OutOfRange.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue696-Resize-Exif-OutOfRange.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue721-InvalidAPP0.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue721-InvalidAPP0.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-A.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-A.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-B.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-B.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-C.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-C.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-load.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-load.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-tranform.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-tranform.jpg.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "progressive", "progressive", "{6458AFCB-A159-47D5-8F2B-50C95C0915E0}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\progressive\BadEofProgressive.jpg = tests\Images\Input\Jpg\progressive\BadEofProgressive.jpg
-		tests\Images\Input\Jpg\progressive\ExifUndefType.jpg = tests\Images\Input\Jpg\progressive\ExifUndefType.jpg
-		tests\Images\Input\Jpg\progressive\fb.jpg = tests\Images\Input\Jpg\progressive\fb.jpg
-		tests\Images\Input\Jpg\progressive\Festzug.jpg = tests\Images\Input\Jpg\progressive\Festzug.jpg
-		tests\Images\Input\Jpg\progressive\progress.jpg = tests\Images\Input\Jpg\progressive\progress.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{39F5197B-CF6C-41A5-9739-7F97E78BB104}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\BadEofProgressive.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\BadEofProgressive.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\ExifUndefType.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\ExifUndefType.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\fb.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\fb.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\Festzug.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\Festzug.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\progress.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\progress.jpg.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Png", "Png", "{E1C42A6F-913B-4A7B-B1A8-2BB62843B254}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Png\banner7-adam.png = tests\Images\Input\Png\banner7-adam.png
-		tests\Images\Input\Png\banner8-index.png = tests\Images\Input\Png\banner8-index.png
-		tests\Images\Input\Png\big-corrupted-chunk.png = tests\Images\Input\Png\big-corrupted-chunk.png
-		tests\Images\Input\Png\Bike.png = tests\Images\Input\Png\Bike.png
-		tests\Images\Input\Png\BikeGrayscale.png = tests\Images\Input\Png\BikeGrayscale.png
-		tests\Images\Input\Png\blur.png = tests\Images\Input\Png\blur.png
-		tests\Images\Input\Png\bpp1.png = tests\Images\Input\Png\bpp1.png
-		tests\Images\Input\Png\CalliphoraPartial.png = tests\Images\Input\Png\CalliphoraPartial.png
-		tests\Images\Input\Png\CalliphoraPartialGrayscale.png = tests\Images\Input\Png\CalliphoraPartialGrayscale.png
-		tests\Images\Input\Png\chunklength1.png = tests\Images\Input\Png\chunklength1.png
-		tests\Images\Input\Png\chunklength2.png = tests\Images\Input\Png\chunklength2.png
-		tests\Images\Input\Png\cross.png = tests\Images\Input\Png\cross.png
-		tests\Images\Input\Png\ducky.png = tests\Images\Input\Png\ducky.png
-		tests\Images\Input\Png\filter0.png = tests\Images\Input\Png\filter0.png
-		tests\Images\Input\Png\filter1.png = tests\Images\Input\Png\filter1.png
-		tests\Images\Input\Png\filter2.png = tests\Images\Input\Png\filter2.png
-		tests\Images\Input\Png\filter3.png = tests\Images\Input\Png\filter3.png
-		tests\Images\Input\Png\filter4.png = tests\Images\Input\Png\filter4.png
-		tests\Images\Input\Png\filterVar.png = tests\Images\Input\Png\filterVar.png
-		tests\Images\Input\Png\gray-1-trns.png = tests\Images\Input\Png\gray-1-trns.png
-		tests\Images\Input\Png\gray-16-tRNS-interlaced.png = tests\Images\Input\Png\gray-16-tRNS-interlaced.png
-		tests\Images\Input\Png\gray-16.png = tests\Images\Input\Png\gray-16.png
-		tests\Images\Input\Png\gray-2-tRNS.png = tests\Images\Input\Png\gray-2-tRNS.png
-		tests\Images\Input\Png\gray-4-tRNS.png = tests\Images\Input\Png\gray-4-tRNS.png
-		tests\Images\Input\Png\gray-8-tRNS.png = tests\Images\Input\Png\gray-8-tRNS.png
-		tests\Images\Input\Png\gray-alpha-16.png = tests\Images\Input\Png\gray-alpha-16.png
-		tests\Images\Input\Png\gray-alpha-8.png = tests\Images\Input\Png\gray-alpha-8.png
-		tests\Images\Input\Png\gray_4bpp.png = tests\Images\Input\Png\gray_4bpp.png
-		tests\Images\Input\Png\icon.png = tests\Images\Input\Png\icon.png
-		tests\Images\Input\Png\iftbbn0g01.png = tests\Images\Input\Png\iftbbn0g01.png
-		tests\Images\Input\Png\iftbbn0g02.png = tests\Images\Input\Png\iftbbn0g02.png
-		tests\Images\Input\Png\iftbbn0g04.png = tests\Images\Input\Png\iftbbn0g04.png
-		tests\Images\Input\Png\indexed.png = tests\Images\Input\Png\indexed.png
-		tests\Images\Input\Png\interlaced.png = tests\Images\Input\Png\interlaced.png
-		tests\Images\Input\Png\kaboom.png = tests\Images\Input\Png\kaboom.png
-		tests\Images\Input\Png\low-variance.png = tests\Images\Input\Png\low-variance.png
-		tests\Images\Input\Png\palette-8bpp.png = tests\Images\Input\Png\palette-8bpp.png
-		tests\Images\Input\Png\pd-dest.png = tests\Images\Input\Png\pd-dest.png
-		tests\Images\Input\Png\pd-source.png = tests\Images\Input\Png\pd-source.png
-		tests\Images\Input\Png\pd.png = tests\Images\Input\Png\pd.png
-		tests\Images\Input\Png\pl.png = tests\Images\Input\Png\pl.png
-		tests\Images\Input\Png\pp.png = tests\Images\Input\Png\pp.png
-		tests\Images\Input\Png\rainbow.png = tests\Images\Input\Png\rainbow.png
-		tests\Images\Input\Png\ratio-1x4.png = tests\Images\Input\Png\ratio-1x4.png
-		tests\Images\Input\Png\ratio-4x1.png = tests\Images\Input\Png\ratio-4x1.png
-		tests\Images\Input\Png\rgb-16-alpha.png = tests\Images\Input\Png\rgb-16-alpha.png
-		tests\Images\Input\Png\rgb-16-tRNS.png = tests\Images\Input\Png\rgb-16-tRNS.png
-		tests\Images\Input\Png\rgb-48bpp-interlaced.png = tests\Images\Input\Png\rgb-48bpp-interlaced.png
-		tests\Images\Input\Png\rgb-48bpp.png = tests\Images\Input\Png\rgb-48bpp.png
-		tests\Images\Input\Png\rgb-8-tRNS.png = tests\Images\Input\Png\rgb-8-tRNS.png
-		tests\Images\Input\Png\rollsroyce.png = tests\Images\Input\Png\rollsroyce.png
-		tests\Images\Input\Png\SnakeGame.png = tests\Images\Input\Png\SnakeGame.png
-		tests\Images\Input\Png\splash-interlaced.png = tests\Images\Input\Png\splash-interlaced.png
-		tests\Images\Input\Png\splash.png = tests\Images\Input\Png\splash.png
-		tests\Images\Input\Png\versioning-1_1.png = tests\Images\Input\Png\versioning-1_1.png
-		tests\Images\Input\Png\versioning-1_2.png = tests\Images\Input\Png\versioning-1_2.png
-		tests\Images\Input\Png\vim16x16_1.png = tests\Images\Input\Png\vim16x16_1.png
-		tests\Images\Input\Png\vim16x16_2.png = tests\Images\Input\Png\vim16x16_2.png
-		tests\Images\Input\Png\zlib-overflow.png = tests\Images\Input\Png\zlib-overflow.png
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing.Tests", "tests\ImageSharp.Drawing.Tests\ImageSharp.Drawing.Tests.csproj", "{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing.Benchmarks", "tests\ImageSharp.Drawing.Benchmarks\ImageSharp.Drawing.Benchmarks.csproj", "{59804113-1DD4-4F80-8D06-35FF71652508}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{23859314-5693-4E6C-BE5C-80A433439D2A}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU", "src\ImageSharp.Drawing.WebGPU\ImageSharp.Drawing.WebGPU.csproj", "{061582C2-658F-40AE-A978-7D74A4EB2C0A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.ShaderGen", "src\ImageSharp.Drawing.WebGPU.ShaderGen\ImageSharp.Drawing.WebGPU.ShaderGen.csproj", "{C7606104-5D58-4670-912C-3F336606B02D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.ManualBenchmarks", "tests\ImageSharp.Drawing.ManualBenchmarks\ImageSharp.Drawing.ManualBenchmarks.csproj", "{70193989-E587-451A-AF34-4C74FEE5DA5A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUWindowDemo", "samples\WebGPUWindowDemo\WebGPUWindowDemo.csproj", "{999D90DE-6940-4693-9F80-701F2D5DB77A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUExternalSurfaceDemo", "samples\WebGPUExternalSurfaceDemo\WebGPUExternalSurfaceDemo.csproj", "{F0AAE591-A44E-48A5-8C74-395BDF98F646}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingBackendBenchmark", "samples\DrawingBackendBenchmark\DrawingBackendBenchmark.csproj", "{B5CF5531-624F-9F49-46BD-937FF4062F54}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.Build.0 = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.Build.0 = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.ActiveCfg = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.Build.0 = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.Build.0 = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.Build.0 = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.Build.0 = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x64.Build.0 = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x86.Build.0 = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x64.ActiveCfg = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x64.Build.0 = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x86.ActiveCfg = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x86.Build.0 = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x64.Build.0 = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x86.Build.0 = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x64.ActiveCfg = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x64.Build.0 = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x86.ActiveCfg = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x86.Build.0 = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x64.Build.0 = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x86.Build.0 = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x64.ActiveCfg = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x64.Build.0 = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x86.ActiveCfg = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x86.Build.0 = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x64.Build.0 = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x86.Build.0 = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x64.Build.0 = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x86.Build.0 = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x64.ActiveCfg = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x64.Build.0 = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x86.ActiveCfg = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x86.Build.0 = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x64.Build.0 = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x64.ActiveCfg = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x64.Build.0 = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x86.Build.0 = Release|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Release|x64.ActiveCfg = Release|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Release|x64.Build.0 = Release|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646}.Release|x86.Build.0 = Release|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Debug|x64.Build.0 = Debug|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Debug|x86.Build.0 = Debug|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Release|x64.ActiveCfg = Release|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Release|x64.Build.0 = Release|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Release|x86.ActiveCfg = Release|Any CPU
-		{B5CF5531-624F-9F49-46BD-937FF4062F54}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1799C43E-5C54-4A8F-8D64-B1475241DB0D} = {C317F1B1-D75E-4C6D-83EB-80367343E0D7}
-		{FBE8C1AD-5AEC-4514-9B64-091D8E145865} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
-		{2E33181E-6E28-4662-A801-E2E7DC206029} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{FA55F5DE-11A6-487D-ABA4-BC93A02717DD} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{9DA226A1-8656-49A8-A58A-A8B5C081AD66} = {FA55F5DE-11A6-487D-ABA4-BC93A02717DD}
-		{1A82C5F6-90E0-4E97-BE16-A825C046B493} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{EE3FB0B3-1C31-41E9-93AB-BA800560A868} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{BF8DFDC1-CEE5-4A37-B216-D3085360C776} = {EE3FB0B3-1C31-41E9-93AB-BA800560A868}
-		{DB21FED7-E8CB-4B00-9EB2-9144D32A590A} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{195BA3D3-3E9F-4BC5-AB40-5F9FEB638146} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
-		{538F0EBD-4084-4EDB-93DD-6D35B733CA48} = {195BA3D3-3E9F-4BC5-AB40-5F9FEB638146}
-		{5C9B689F-B96D-47BE-A208-C23B1B2A8570} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
-		{516A3532-6AC2-417B-AD79-9BD5D0D378A0} = {5C9B689F-B96D-47BE-A208-C23B1B2A8570}
-		{714CDEA1-9AE6-4F76-B8B1-A7DB8C1DB82F} = {5C9B689F-B96D-47BE-A208-C23B1B2A8570}
-		{6458AFCB-A159-47D5-8F2B-50C95C0915E0} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
-		{39F5197B-CF6C-41A5-9739-7F97E78BB104} = {6458AFCB-A159-47D5-8F2B-50C95C0915E0}
-		{E1C42A6F-913B-4A7B-B1A8-2BB62843B254} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{59804113-1DD4-4F80-8D06-35FF71652508} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{23859314-5693-4E6C-BE5C-80A433439D2A} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{C7606104-5D58-4670-912C-3F336606B02D} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{70193989-E587-451A-AF34-4C74FEE5DA5A} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{999D90DE-6940-4693-9F80-701F2D5DB77A} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
-		{F0AAE591-A44E-48A5-8C74-395BDF98F646} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
-		{B5CF5531-624F-9F49-46BD-937FF4062F54} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5F8B9D1F-CD8B-4CC5-8216-D531E25BD795}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2e33181e-6e28-4662-a801-e2e7dc206029}*SharedItemsImports = 5
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
-EndGlobal
diff --git a/ImageSharp.Drawing.All.slnx b/ImageSharp.Drawing.All.slnx
new file mode 100644
index 000000000..210a96448
--- /dev/null
+++ b/ImageSharp.Drawing.All.slnx
@@ -0,0 +1,304 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/samples/">
+    <Project Path="samples/DrawingBackendBenchmark/DrawingBackendBenchmark.csproj" />
+    <Project Path="samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj" />
+    <Project Path="samples/WebGPUExternalSurfaceDemo/WebGPUExternalSurfaceDemo.csproj" />
+    <Project Path="samples/WebGPUWindowDemo/WebGPUWindowDemo.csproj" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+    <Project Path="shared-infrastructure/src/SharedInfrastructure/SharedInfrastructure.shproj" />
+    <Project Path="src/ImageSharp.Drawing.WebGPU.ShaderGen/ImageSharp.Drawing.WebGPU.ShaderGen.csproj" />
+    <Project Path="src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj" />
+    <Project Path="src/ImageSharp.Drawing/ImageSharp.Drawing.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <File Path="tests/Directory.Build.props" />
+    <File Path="tests/Directory.Build.targets" />
+    <Project Path="tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj" />
+    <Project Path="tests/ImageSharp.Drawing.ManualBenchmarks/ImageSharp.Drawing.ManualBenchmarks.csproj" />
+    <Project Path="tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Images/" />
+  <Folder Name="/tests/Images/Input/" />
+  <Folder Name="/tests/Images/Input/Bmp/">
+    <File Path="tests/Images/Input/Bmp/BitmapCoreHeaderQR.bmp" />
+    <File Path="tests/Images/Input/Bmp/BITMAPV5HEADER.bmp" />
+    <File Path="tests/Images/Input/Bmp/Car.bmp" />
+    <File Path="tests/Images/Input/Bmp/F.bmp" />
+    <File Path="tests/Images/Input/Bmp/issue735.bmp" />
+    <File Path="tests/Images/Input/Bmp/neg_height.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal1.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal1p1.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal4.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal4rle.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8-0.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8gs.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8offs.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2sp.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2v1_winv2.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2v2-16.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2v2.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8v4.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8v5.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16-565.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16-565pal.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16bfdef.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb24.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb32.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb32bf.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb32bfdef.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32-1010102.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32abf.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32h56.bmp" />
+    <File Path="tests/Images/Input/Bmp/RunLengthEncoded-inverted.bmp" />
+    <File Path="tests/Images/Input/Bmp/RunLengthEncoded.bmp" />
+    <File Path="tests/Images/Input/Bmp/test16-inverted.bmp" />
+    <File Path="tests/Images/Input/Bmp/test16.bmp" />
+    <File Path="tests/Images/Input/Bmp/test8-inverted.bmp" />
+    <File Path="tests/Images/Input/Bmp/test8.bmp" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Gif/">
+    <File Path="tests/Images/Input/Gif/base_1x4.gif" />
+    <File Path="tests/Images/Input/Gif/base_4x1.gif" />
+    <File Path="tests/Images/Input/Gif/cheers.gif" />
+    <File Path="tests/Images/Input/Gif/giphy.gif" />
+    <File Path="tests/Images/Input/Gif/kumin.gif" />
+    <File Path="tests/Images/Input/Gif/leo.gif" />
+    <File Path="tests/Images/Input/Gif/rings.gif" />
+    <File Path="tests/Images/Input/Gif/trans.gif" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Gif/issues/">
+    <File Path="tests/Images/Input/Gif/issues/issue403_baddescriptorwidth.gif" />
+    <File Path="tests/Images/Input/Gif/issues/issue405_badappextlength252-2.gif" />
+    <File Path="tests/Images/Input/Gif/issues/issue405_badappextlength252.gif" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/" />
+  <Folder Name="/tests/Images/Input/Jpg/baseline/">
+    <File Path="tests/Images/Input/Jpg/baseline/AsianCarvingLowContrast.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/badeof.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/badrst.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Calliphora.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/cmyk.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/exif.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Floorplan.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Hiyamugi.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg400jfif.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg420exif.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg420small.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg444.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Lake.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/MultiScanBaselineCMYK.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/ratio-1x1.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Snake.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/testimgint.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/testorig.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/testorig12.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/turtle.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/ycck-subsample-1222.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/ycck.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/baseline/JpegSnoopReports/">
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/badeof.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/badrst.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Calliphora.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/cmyk.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/exif.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Floorplan.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/gamma_dalai_lama_gray.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Hiyamugi.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg400jfif.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg420exif.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg420small.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg444.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Lake.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/MultiScanBaselineCMYK.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/ratio-1x1.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Snake.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/testimgint.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/testorig.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/turtle.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/ycck.jpg.txt" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/issues/">
+    <File Path="tests/Images/Input/Jpg/issues/Issue159-MissingFF00-Progressive-Bedroom.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue159-MissingFF00-Progressive-Girl.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue178-BadCoeffsProgressive-Lemon.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue214-CriticalEOF.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue385-BadZigZag-Progressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue394-MultiHuffmanBaseline-Speakers.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue517-No-EOI-Progressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue518-Bad-RST-Progressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue520-InvalidCast.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue624-DhtHasWrongLength-Progressive-N.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue694-Decode-Exif-OutOfRange.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue695-Invalid-EOI.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue696-Resize-Exif-OutOfRange.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue721-InvalidAPP0.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue723-Ordered-Interleaved-Progressive-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue723-Ordered-Interleaved-Progressive-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue723-Ordered-Interleaved-Progressive-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/issue750-exif-load.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/issue750-exif-tranform.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue845-Incorrect-Quality99.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/issue855-incorrect-colorspace.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/issues/fuzz/">
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue797-NullReferenceException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue798-AccessViolationException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue821-DivideByZeroException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue822-DivideByZeroException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue823-NullReferenceException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-D.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-E.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-F.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-G.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-H.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-D.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue827-AccessViolationException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue839-ExecutionEngineException.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/issues/JpegSnoopReports/">
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue159-MissingFF00-Progressive-Bedroom.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue159-MissingFF00-Progressive-Girl.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue178-BadCoeffsProgressive-Lemon.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue214-CriticalEOF .jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue385-BadZigZag-Progressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue394-MultiHuffmanBaseline-Speakers.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue517-No-EOI-Progressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue518-Bad-RST-Progressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue520-InvalidCast.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue624-DhtHasWrongLength-Progressive-N.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue694-Decode-Exif-OutOfRange.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue695-Invalid-EOI.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue696-Resize-Exif-OutOfRange.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue721-InvalidAPP0.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue723-Ordered-Interleaved-Progressive-A.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue723-Ordered-Interleaved-Progressive-B.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue723-Ordered-Interleaved-Progressive-C.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/issue750-exif-load.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/issue750-exif-tranform.jpg.txt" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/progressive/">
+    <File Path="tests/Images/Input/Jpg/progressive/BadEofProgressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/ExifUndefType.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/fb.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/Festzug.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/progress.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/progressive/JpegSnoopReports/">
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/BadEofProgressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/ExifUndefType.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/fb.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/Festzug.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/progress.jpg.txt" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Png/">
+    <File Path="tests/Images/Input/Png/banner7-adam.png" />
+    <File Path="tests/Images/Input/Png/banner8-index.png" />
+    <File Path="tests/Images/Input/Png/big-corrupted-chunk.png" />
+    <File Path="tests/Images/Input/Png/Bike.png" />
+    <File Path="tests/Images/Input/Png/BikeGrayscale.png" />
+    <File Path="tests/Images/Input/Png/blur.png" />
+    <File Path="tests/Images/Input/Png/bpp1.png" />
+    <File Path="tests/Images/Input/Png/CalliphoraPartial.png" />
+    <File Path="tests/Images/Input/Png/CalliphoraPartialGrayscale.png" />
+    <File Path="tests/Images/Input/Png/chunklength1.png" />
+    <File Path="tests/Images/Input/Png/chunklength2.png" />
+    <File Path="tests/Images/Input/Png/cross.png" />
+    <File Path="tests/Images/Input/Png/ducky.png" />
+    <File Path="tests/Images/Input/Png/filter0.png" />
+    <File Path="tests/Images/Input/Png/filter1.png" />
+    <File Path="tests/Images/Input/Png/filter2.png" />
+    <File Path="tests/Images/Input/Png/filter3.png" />
+    <File Path="tests/Images/Input/Png/filter4.png" />
+    <File Path="tests/Images/Input/Png/filterVar.png" />
+    <File Path="tests/Images/Input/Png/gray-1-trns.png" />
+    <File Path="tests/Images/Input/Png/gray-16-tRNS-interlaced.png" />
+    <File Path="tests/Images/Input/Png/gray-16.png" />
+    <File Path="tests/Images/Input/Png/gray-2-tRNS.png" />
+    <File Path="tests/Images/Input/Png/gray-4-tRNS.png" />
+    <File Path="tests/Images/Input/Png/gray-8-tRNS.png" />
+    <File Path="tests/Images/Input/Png/gray-alpha-16.png" />
+    <File Path="tests/Images/Input/Png/gray-alpha-8.png" />
+    <File Path="tests/Images/Input/Png/gray_4bpp.png" />
+    <File Path="tests/Images/Input/Png/icon.png" />
+    <File Path="tests/Images/Input/Png/iftbbn0g01.png" />
+    <File Path="tests/Images/Input/Png/iftbbn0g02.png" />
+    <File Path="tests/Images/Input/Png/iftbbn0g04.png" />
+    <File Path="tests/Images/Input/Png/indexed.png" />
+    <File Path="tests/Images/Input/Png/interlaced.png" />
+    <File Path="tests/Images/Input/Png/kaboom.png" />
+    <File Path="tests/Images/Input/Png/low-variance.png" />
+    <File Path="tests/Images/Input/Png/palette-8bpp.png" />
+    <File Path="tests/Images/Input/Png/pd-dest.png" />
+    <File Path="tests/Images/Input/Png/pd-source.png" />
+    <File Path="tests/Images/Input/Png/pd.png" />
+    <File Path="tests/Images/Input/Png/pl.png" />
+    <File Path="tests/Images/Input/Png/pp.png" />
+    <File Path="tests/Images/Input/Png/rainbow.png" />
+    <File Path="tests/Images/Input/Png/ratio-1x4.png" />
+    <File Path="tests/Images/Input/Png/ratio-4x1.png" />
+    <File Path="tests/Images/Input/Png/rgb-16-alpha.png" />
+    <File Path="tests/Images/Input/Png/rgb-16-tRNS.png" />
+    <File Path="tests/Images/Input/Png/rgb-48bpp-interlaced.png" />
+    <File Path="tests/Images/Input/Png/rgb-48bpp.png" />
+    <File Path="tests/Images/Input/Png/rgb-8-tRNS.png" />
+    <File Path="tests/Images/Input/Png/rollsroyce.png" />
+    <File Path="tests/Images/Input/Png/SnakeGame.png" />
+    <File Path="tests/Images/Input/Png/splash-interlaced.png" />
+    <File Path="tests/Images/Input/Png/splash.png" />
+    <File Path="tests/Images/Input/Png/versioning-1_1.png" />
+    <File Path="tests/Images/Input/Png/versioning-1_2.png" />
+    <File Path="tests/Images/Input/Png/vim16x16_1.png" />
+    <File Path="tests/Images/Input/Png/vim16x16_2.png" />
+    <File Path="tests/Images/Input/Png/zlib-overflow.png" />
+  </Folder>
+  <Folder Name="/_root/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path=".gitmodules" />
+    <File Path="ci-build.ps1" />
+    <File Path="ci-pack.ps1" />
+    <File Path="ci-test.ps1" />
+    <File Path="codecov.yml" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+    <File Path="THIRD-PARTY-NOTICES" />
+  </Folder>
+  <Folder Name="/_root/.github/">
+    <File Path=".github/CONTRIBUTING.md" />
+    <File Path=".github/PULL_REQUEST_TEMPLATE.md" />
+  </Folder>
+  <Folder Name="/_root/.github/ISSUE_TEMPLATE/">
+    <File Path=".github/ISSUE_TEMPLATE/config.yml" />
+    <File Path=".github/ISSUE_TEMPLATE/oss-bug-report.yml" />
+  </Folder>
+  <Folder Name="/_root/.github/workflows/">
+    <File Path=".github/workflows/build-and-test.yml" />
+  </Folder>
+  <Properties Name="Performance">
+    <Property Name="HasPerformanceSessions" Value="true" />
+  </Properties>
+</Solution>
diff --git a/ImageSharp.Drawing.sln b/ImageSharp.Drawing.sln
deleted file mode 100644
index 9f68e9131..000000000
--- a/ImageSharp.Drawing.sln
+++ /dev/null
@@ -1,493 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.0.11123.170
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		.gitmodules = .gitmodules
-		ci-build.ps1 = ci-build.ps1
-		ci-pack.ps1 = ci-pack.ps1
-		ci-test.ps1 = ci-test.ps1
-		codecov.yml = codecov.yml
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		LICENSE = LICENSE
-		README.md = README.md
-		THIRD-PARTY-NOTICES = THIRD-PARTY-NOTICES
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1799C43E-5C54-4A8F-8D64-B1475241DB0D}"
-	ProjectSection(SolutionItems) = preProject
-		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
-		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{FBE8C1AD-5AEC-4514-9B64-091D8E145865}"
-	ProjectSection(SolutionItems) = preProject
-		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
-		.github\ISSUE_TEMPLATE\oss-bug-report.yml = .github\ISSUE_TEMPLATE\oss-bug-report.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-		src\Directory.Build.targets = src\Directory.Build.targets
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{2E33181E-6E28-4662-A801-E2E7DC206029}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56801022-D71A-4FBE-BC5B-CBA08E2284EC}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Directory.Build.props = tests\Directory.Build.props
-		tests\Directory.Build.targets = tests\Directory.Build.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{FA55F5DE-11A6-487D-ABA4-BC93A02717DD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Input", "Input", "{9DA226A1-8656-49A8-A58A-A8B5C081AD66}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bmp", "Bmp", "{1A82C5F6-90E0-4E97-BE16-A825C046B493}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Bmp\BitmapCoreHeaderQR.bmp = tests\Images\Input\Bmp\BitmapCoreHeaderQR.bmp
-		tests\Images\Input\Bmp\BITMAPV5HEADER.bmp = tests\Images\Input\Bmp\BITMAPV5HEADER.bmp
-		tests\Images\Input\Bmp\Car.bmp = tests\Images\Input\Bmp\Car.bmp
-		tests\Images\Input\Bmp\F.bmp = tests\Images\Input\Bmp\F.bmp
-		tests\Images\Input\Bmp\issue735.bmp = tests\Images\Input\Bmp\issue735.bmp
-		tests\Images\Input\Bmp\neg_height.bmp = tests\Images\Input\Bmp\neg_height.bmp
-		tests\Images\Input\Bmp\pal1.bmp = tests\Images\Input\Bmp\pal1.bmp
-		tests\Images\Input\Bmp\pal1p1.bmp = tests\Images\Input\Bmp\pal1p1.bmp
-		tests\Images\Input\Bmp\pal4.bmp = tests\Images\Input\Bmp\pal4.bmp
-		tests\Images\Input\Bmp\pal4rle.bmp = tests\Images\Input\Bmp\pal4rle.bmp
-		tests\Images\Input\Bmp\pal8-0.bmp = tests\Images\Input\Bmp\pal8-0.bmp
-		tests\Images\Input\Bmp\pal8gs.bmp = tests\Images\Input\Bmp\pal8gs.bmp
-		tests\Images\Input\Bmp\pal8offs.bmp = tests\Images\Input\Bmp\pal8offs.bmp
-		tests\Images\Input\Bmp\pal8os2sp.bmp = tests\Images\Input\Bmp\pal8os2sp.bmp
-		tests\Images\Input\Bmp\pal8os2v1_winv2.bmp = tests\Images\Input\Bmp\pal8os2v1_winv2.bmp
-		tests\Images\Input\Bmp\pal8os2v2-16.bmp = tests\Images\Input\Bmp\pal8os2v2-16.bmp
-		tests\Images\Input\Bmp\pal8os2v2.bmp = tests\Images\Input\Bmp\pal8os2v2.bmp
-		tests\Images\Input\Bmp\pal8v4.bmp = tests\Images\Input\Bmp\pal8v4.bmp
-		tests\Images\Input\Bmp\pal8v5.bmp = tests\Images\Input\Bmp\pal8v5.bmp
-		tests\Images\Input\Bmp\rgb16-565.bmp = tests\Images\Input\Bmp\rgb16-565.bmp
-		tests\Images\Input\Bmp\rgb16-565pal.bmp = tests\Images\Input\Bmp\rgb16-565pal.bmp
-		tests\Images\Input\Bmp\rgb16.bmp = tests\Images\Input\Bmp\rgb16.bmp
-		tests\Images\Input\Bmp\rgb16bfdef.bmp = tests\Images\Input\Bmp\rgb16bfdef.bmp
-		tests\Images\Input\Bmp\rgb24.bmp = tests\Images\Input\Bmp\rgb24.bmp
-		tests\Images\Input\Bmp\rgb32.bmp = tests\Images\Input\Bmp\rgb32.bmp
-		tests\Images\Input\Bmp\rgb32bf.bmp = tests\Images\Input\Bmp\rgb32bf.bmp
-		tests\Images\Input\Bmp\rgb32bfdef.bmp = tests\Images\Input\Bmp\rgb32bfdef.bmp
-		tests\Images\Input\Bmp\rgba32-1010102.bmp = tests\Images\Input\Bmp\rgba32-1010102.bmp
-		tests\Images\Input\Bmp\rgba32.bmp = tests\Images\Input\Bmp\rgba32.bmp
-		tests\Images\Input\Bmp\rgba32abf.bmp = tests\Images\Input\Bmp\rgba32abf.bmp
-		tests\Images\Input\Bmp\rgba32h56.bmp = tests\Images\Input\Bmp\rgba32h56.bmp
-		tests\Images\Input\Bmp\RunLengthEncoded-inverted.bmp = tests\Images\Input\Bmp\RunLengthEncoded-inverted.bmp
-		tests\Images\Input\Bmp\RunLengthEncoded.bmp = tests\Images\Input\Bmp\RunLengthEncoded.bmp
-		tests\Images\Input\Bmp\test16-inverted.bmp = tests\Images\Input\Bmp\test16-inverted.bmp
-		tests\Images\Input\Bmp\test16.bmp = tests\Images\Input\Bmp\test16.bmp
-		tests\Images\Input\Bmp\test8-inverted.bmp = tests\Images\Input\Bmp\test8-inverted.bmp
-		tests\Images\Input\Bmp\test8.bmp = tests\Images\Input\Bmp\test8.bmp
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gif", "Gif", "{EE3FB0B3-1C31-41E9-93AB-BA800560A868}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Gif\base_1x4.gif = tests\Images\Input\Gif\base_1x4.gif
-		tests\Images\Input\Gif\base_4x1.gif = tests\Images\Input\Gif\base_4x1.gif
-		tests\Images\Input\Gif\cheers.gif = tests\Images\Input\Gif\cheers.gif
-		tests\Images\Input\Gif\giphy.gif = tests\Images\Input\Gif\giphy.gif
-		tests\Images\Input\Gif\kumin.gif = tests\Images\Input\Gif\kumin.gif
-		tests\Images\Input\Gif\leo.gif = tests\Images\Input\Gif\leo.gif
-		tests\Images\Input\Gif\rings.gif = tests\Images\Input\Gif\rings.gif
-		tests\Images\Input\Gif\trans.gif = tests\Images\Input\Gif\trans.gif
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "issues", "issues", "{BF8DFDC1-CEE5-4A37-B216-D3085360C776}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Gif\issues\issue403_baddescriptorwidth.gif = tests\Images\Input\Gif\issues\issue403_baddescriptorwidth.gif
-		tests\Images\Input\Gif\issues\issue405_badappextlength252-2.gif = tests\Images\Input\Gif\issues\issue405_badappextlength252-2.gif
-		tests\Images\Input\Gif\issues\issue405_badappextlength252.gif = tests\Images\Input\Gif\issues\issue405_badappextlength252.gif
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jpg", "Jpg", "{DB21FED7-E8CB-4B00-9EB2-9144D32A590A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "baseline", "baseline", "{195BA3D3-3E9F-4BC5-AB40-5F9FEB638146}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\baseline\AsianCarvingLowContrast.jpg = tests\Images\Input\Jpg\baseline\AsianCarvingLowContrast.jpg
-		tests\Images\Input\Jpg\baseline\badeof.jpg = tests\Images\Input\Jpg\baseline\badeof.jpg
-		tests\Images\Input\Jpg\baseline\badrst.jpg = tests\Images\Input\Jpg\baseline\badrst.jpg
-		tests\Images\Input\Jpg\baseline\Calliphora.jpg = tests\Images\Input\Jpg\baseline\Calliphora.jpg
-		tests\Images\Input\Jpg\baseline\cmyk.jpg = tests\Images\Input\Jpg\baseline\cmyk.jpg
-		tests\Images\Input\Jpg\baseline\exif.jpg = tests\Images\Input\Jpg\baseline\exif.jpg
-		tests\Images\Input\Jpg\baseline\Floorplan.jpg = tests\Images\Input\Jpg\baseline\Floorplan.jpg
-		tests\Images\Input\Jpg\baseline\gamma_dalai_lama_gray.jpg = tests\Images\Input\Jpg\baseline\gamma_dalai_lama_gray.jpg
-		tests\Images\Input\Jpg\baseline\Hiyamugi.jpg = tests\Images\Input\Jpg\baseline\Hiyamugi.jpg
-		tests\Images\Input\Jpg\baseline\jpeg400jfif.jpg = tests\Images\Input\Jpg\baseline\jpeg400jfif.jpg
-		tests\Images\Input\Jpg\baseline\jpeg420exif.jpg = tests\Images\Input\Jpg\baseline\jpeg420exif.jpg
-		tests\Images\Input\Jpg\baseline\jpeg420small.jpg = tests\Images\Input\Jpg\baseline\jpeg420small.jpg
-		tests\Images\Input\Jpg\baseline\jpeg444.jpg = tests\Images\Input\Jpg\baseline\jpeg444.jpg
-		tests\Images\Input\Jpg\baseline\Lake.jpg = tests\Images\Input\Jpg\baseline\Lake.jpg
-		tests\Images\Input\Jpg\baseline\MultiScanBaselineCMYK.jpg = tests\Images\Input\Jpg\baseline\MultiScanBaselineCMYK.jpg
-		tests\Images\Input\Jpg\baseline\ratio-1x1.jpg = tests\Images\Input\Jpg\baseline\ratio-1x1.jpg
-		tests\Images\Input\Jpg\baseline\Snake.jpg = tests\Images\Input\Jpg\baseline\Snake.jpg
-		tests\Images\Input\Jpg\baseline\testimgint.jpg = tests\Images\Input\Jpg\baseline\testimgint.jpg
-		tests\Images\Input\Jpg\baseline\testorig.jpg = tests\Images\Input\Jpg\baseline\testorig.jpg
-		tests\Images\Input\Jpg\baseline\testorig12.jpg = tests\Images\Input\Jpg\baseline\testorig12.jpg
-		tests\Images\Input\Jpg\baseline\turtle.jpg = tests\Images\Input\Jpg\baseline\turtle.jpg
-		tests\Images\Input\Jpg\baseline\ycck-subsample-1222.jpg = tests\Images\Input\Jpg\baseline\ycck-subsample-1222.jpg
-		tests\Images\Input\Jpg\baseline\ycck.jpg = tests\Images\Input\Jpg\baseline\ycck.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{538F0EBD-4084-4EDB-93DD-6D35B733CA48}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\badeof.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\badeof.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\badrst.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\badrst.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Calliphora.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Calliphora.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\cmyk.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\cmyk.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\exif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\exif.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Floorplan.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Floorplan.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\gamma_dalai_lama_gray.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\gamma_dalai_lama_gray.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Hiyamugi.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Hiyamugi.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg400jfif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg400jfif.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420exif.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420exif.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420small.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg420small.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg444.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\jpeg444.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Lake.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Lake.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\MultiScanBaselineCMYK.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\MultiScanBaselineCMYK.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\ratio-1x1.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\ratio-1x1.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\Snake.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\Snake.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\testimgint.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\testimgint.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\testorig.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\testorig.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\turtle.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\turtle.jpg.txt
-		tests\Images\Input\Jpg\baseline\JpegSnoopReports\ycck.jpg.txt = tests\Images\Input\Jpg\baseline\JpegSnoopReports\ycck.jpg.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "issues", "issues", "{5C9B689F-B96D-47BE-A208-C23B1B2A8570}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Bedroom.jpg = tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Bedroom.jpg
-		tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Girl.jpg = tests\Images\Input\Jpg\issues\Issue159-MissingFF00-Progressive-Girl.jpg
-		tests\Images\Input\Jpg\issues\Issue178-BadCoeffsProgressive-Lemon.jpg = tests\Images\Input\Jpg\issues\Issue178-BadCoeffsProgressive-Lemon.jpg
-		tests\Images\Input\Jpg\issues\Issue214-CriticalEOF.jpg = tests\Images\Input\Jpg\issues\Issue214-CriticalEOF.jpg
-		tests\Images\Input\Jpg\issues\Issue385-BadZigZag-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue385-BadZigZag-Progressive.jpg
-		tests\Images\Input\Jpg\issues\Issue394-MultiHuffmanBaseline-Speakers.jpg = tests\Images\Input\Jpg\issues\Issue394-MultiHuffmanBaseline-Speakers.jpg
-		tests\Images\Input\Jpg\issues\Issue517-No-EOI-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue517-No-EOI-Progressive.jpg
-		tests\Images\Input\Jpg\issues\Issue518-Bad-RST-Progressive.jpg = tests\Images\Input\Jpg\issues\Issue518-Bad-RST-Progressive.jpg
-		tests\Images\Input\Jpg\issues\Issue520-InvalidCast.jpg = tests\Images\Input\Jpg\issues\Issue520-InvalidCast.jpg
-		tests\Images\Input\Jpg\issues\Issue624-DhtHasWrongLength-Progressive-N.jpg = tests\Images\Input\Jpg\issues\Issue624-DhtHasWrongLength-Progressive-N.jpg
-		tests\Images\Input\Jpg\issues\Issue694-Decode-Exif-OutOfRange.jpg = tests\Images\Input\Jpg\issues\Issue694-Decode-Exif-OutOfRange.jpg
-		tests\Images\Input\Jpg\issues\Issue695-Invalid-EOI.jpg = tests\Images\Input\Jpg\issues\Issue695-Invalid-EOI.jpg
-		tests\Images\Input\Jpg\issues\Issue696-Resize-Exif-OutOfRange.jpg = tests\Images\Input\Jpg\issues\Issue696-Resize-Exif-OutOfRange.jpg
-		tests\Images\Input\Jpg\issues\Issue721-InvalidAPP0.jpg = tests\Images\Input\Jpg\issues\Issue721-InvalidAPP0.jpg
-		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-A.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-A.jpg
-		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-B.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-B.jpg
-		tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-C.jpg = tests\Images\Input\Jpg\issues\Issue723-Ordered-Interleaved-Progressive-C.jpg
-		tests\Images\Input\Jpg\issues\issue750-exif-load.jpg = tests\Images\Input\Jpg\issues\issue750-exif-load.jpg
-		tests\Images\Input\Jpg\issues\issue750-exif-tranform.jpg = tests\Images\Input\Jpg\issues\issue750-exif-tranform.jpg
-		tests\Images\Input\Jpg\issues\Issue845-Incorrect-Quality99.jpg = tests\Images\Input\Jpg\issues\Issue845-Incorrect-Quality99.jpg
-		tests\Images\Input\Jpg\issues\issue855-incorrect-colorspace.jpg = tests\Images\Input\Jpg\issues\issue855-incorrect-colorspace.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fuzz", "fuzz", "{516A3532-6AC2-417B-AD79-9BD5D0D378A0}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\issues\fuzz\Issue797-NullReferenceException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue797-NullReferenceException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue798-AccessViolationException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue798-AccessViolationException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue821-DivideByZeroException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue821-DivideByZeroException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue822-DivideByZeroException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue822-DivideByZeroException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue823-NullReferenceException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue823-NullReferenceException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-A.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-B.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-C.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-D.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-D.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-E.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-E.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-F.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-F.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-G.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-G.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-H.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue824-IndexOutOfRangeException-H.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-A.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-B.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-C.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-D.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue825-ArgumentOutOfRangeException-D.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-A.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-A.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-B.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-B.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-C.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue826-ArgumentException-C.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue827-AccessViolationException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue827-AccessViolationException.jpg
-		tests\Images\Input\Jpg\issues\fuzz\Issue839-ExecutionEngineException.jpg = tests\Images\Input\Jpg\issues\fuzz\Issue839-ExecutionEngineException.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{714CDEA1-9AE6-4F76-B8B1-A7DB8C1DB82F}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Bedroom.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Bedroom.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Girl.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue159-MissingFF00-Progressive-Girl.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue178-BadCoeffsProgressive-Lemon.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue178-BadCoeffsProgressive-Lemon.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue214-CriticalEOF .jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue214-CriticalEOF .jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue385-BadZigZag-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue385-BadZigZag-Progressive.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue394-MultiHuffmanBaseline-Speakers.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue394-MultiHuffmanBaseline-Speakers.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue517-No-EOI-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue517-No-EOI-Progressive.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue518-Bad-RST-Progressive.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue518-Bad-RST-Progressive.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue520-InvalidCast.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue520-InvalidCast.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue624-DhtHasWrongLength-Progressive-N.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue624-DhtHasWrongLength-Progressive-N.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue694-Decode-Exif-OutOfRange.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue694-Decode-Exif-OutOfRange.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue695-Invalid-EOI.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue695-Invalid-EOI.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue696-Resize-Exif-OutOfRange.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue696-Resize-Exif-OutOfRange.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue721-InvalidAPP0.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue721-InvalidAPP0.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-A.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-A.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-B.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-B.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-C.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\Issue723-Ordered-Interleaved-Progressive-C.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-load.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-load.jpg.txt
-		tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-tranform.jpg.txt = tests\Images\Input\Jpg\issues\JpegSnoopReports\issue750-exif-tranform.jpg.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "progressive", "progressive", "{6458AFCB-A159-47D5-8F2B-50C95C0915E0}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\progressive\BadEofProgressive.jpg = tests\Images\Input\Jpg\progressive\BadEofProgressive.jpg
-		tests\Images\Input\Jpg\progressive\ExifUndefType.jpg = tests\Images\Input\Jpg\progressive\ExifUndefType.jpg
-		tests\Images\Input\Jpg\progressive\fb.jpg = tests\Images\Input\Jpg\progressive\fb.jpg
-		tests\Images\Input\Jpg\progressive\Festzug.jpg = tests\Images\Input\Jpg\progressive\Festzug.jpg
-		tests\Images\Input\Jpg\progressive\progress.jpg = tests\Images\Input\Jpg\progressive\progress.jpg
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JpegSnoopReports", "JpegSnoopReports", "{39F5197B-CF6C-41A5-9739-7F97E78BB104}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\BadEofProgressive.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\BadEofProgressive.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\ExifUndefType.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\ExifUndefType.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\fb.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\fb.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\Festzug.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\Festzug.jpg.txt
-		tests\Images\Input\Jpg\progressive\JpegSnoopReports\progress.jpg.txt = tests\Images\Input\Jpg\progressive\JpegSnoopReports\progress.jpg.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Png", "Png", "{E1C42A6F-913B-4A7B-B1A8-2BB62843B254}"
-	ProjectSection(SolutionItems) = preProject
-		tests\Images\Input\Png\banner7-adam.png = tests\Images\Input\Png\banner7-adam.png
-		tests\Images\Input\Png\banner8-index.png = tests\Images\Input\Png\banner8-index.png
-		tests\Images\Input\Png\big-corrupted-chunk.png = tests\Images\Input\Png\big-corrupted-chunk.png
-		tests\Images\Input\Png\Bike.png = tests\Images\Input\Png\Bike.png
-		tests\Images\Input\Png\BikeGrayscale.png = tests\Images\Input\Png\BikeGrayscale.png
-		tests\Images\Input\Png\blur.png = tests\Images\Input\Png\blur.png
-		tests\Images\Input\Png\bpp1.png = tests\Images\Input\Png\bpp1.png
-		tests\Images\Input\Png\CalliphoraPartial.png = tests\Images\Input\Png\CalliphoraPartial.png
-		tests\Images\Input\Png\CalliphoraPartialGrayscale.png = tests\Images\Input\Png\CalliphoraPartialGrayscale.png
-		tests\Images\Input\Png\chunklength1.png = tests\Images\Input\Png\chunklength1.png
-		tests\Images\Input\Png\chunklength2.png = tests\Images\Input\Png\chunklength2.png
-		tests\Images\Input\Png\cross.png = tests\Images\Input\Png\cross.png
-		tests\Images\Input\Png\ducky.png = tests\Images\Input\Png\ducky.png
-		tests\Images\Input\Png\filter0.png = tests\Images\Input\Png\filter0.png
-		tests\Images\Input\Png\filter1.png = tests\Images\Input\Png\filter1.png
-		tests\Images\Input\Png\filter2.png = tests\Images\Input\Png\filter2.png
-		tests\Images\Input\Png\filter3.png = tests\Images\Input\Png\filter3.png
-		tests\Images\Input\Png\filter4.png = tests\Images\Input\Png\filter4.png
-		tests\Images\Input\Png\filterVar.png = tests\Images\Input\Png\filterVar.png
-		tests\Images\Input\Png\gray-1-trns.png = tests\Images\Input\Png\gray-1-trns.png
-		tests\Images\Input\Png\gray-16-tRNS-interlaced.png = tests\Images\Input\Png\gray-16-tRNS-interlaced.png
-		tests\Images\Input\Png\gray-16.png = tests\Images\Input\Png\gray-16.png
-		tests\Images\Input\Png\gray-2-tRNS.png = tests\Images\Input\Png\gray-2-tRNS.png
-		tests\Images\Input\Png\gray-4-tRNS.png = tests\Images\Input\Png\gray-4-tRNS.png
-		tests\Images\Input\Png\gray-8-tRNS.png = tests\Images\Input\Png\gray-8-tRNS.png
-		tests\Images\Input\Png\gray-alpha-16.png = tests\Images\Input\Png\gray-alpha-16.png
-		tests\Images\Input\Png\gray-alpha-8.png = tests\Images\Input\Png\gray-alpha-8.png
-		tests\Images\Input\Png\gray_4bpp.png = tests\Images\Input\Png\gray_4bpp.png
-		tests\Images\Input\Png\icon.png = tests\Images\Input\Png\icon.png
-		tests\Images\Input\Png\iftbbn0g01.png = tests\Images\Input\Png\iftbbn0g01.png
-		tests\Images\Input\Png\iftbbn0g02.png = tests\Images\Input\Png\iftbbn0g02.png
-		tests\Images\Input\Png\iftbbn0g04.png = tests\Images\Input\Png\iftbbn0g04.png
-		tests\Images\Input\Png\indexed.png = tests\Images\Input\Png\indexed.png
-		tests\Images\Input\Png\interlaced.png = tests\Images\Input\Png\interlaced.png
-		tests\Images\Input\Png\kaboom.png = tests\Images\Input\Png\kaboom.png
-		tests\Images\Input\Png\low-variance.png = tests\Images\Input\Png\low-variance.png
-		tests\Images\Input\Png\palette-8bpp.png = tests\Images\Input\Png\palette-8bpp.png
-		tests\Images\Input\Png\pd-dest.png = tests\Images\Input\Png\pd-dest.png
-		tests\Images\Input\Png\pd-source.png = tests\Images\Input\Png\pd-source.png
-		tests\Images\Input\Png\pd.png = tests\Images\Input\Png\pd.png
-		tests\Images\Input\Png\pl.png = tests\Images\Input\Png\pl.png
-		tests\Images\Input\Png\pp.png = tests\Images\Input\Png\pp.png
-		tests\Images\Input\Png\rainbow.png = tests\Images\Input\Png\rainbow.png
-		tests\Images\Input\Png\ratio-1x4.png = tests\Images\Input\Png\ratio-1x4.png
-		tests\Images\Input\Png\ratio-4x1.png = tests\Images\Input\Png\ratio-4x1.png
-		tests\Images\Input\Png\rgb-16-alpha.png = tests\Images\Input\Png\rgb-16-alpha.png
-		tests\Images\Input\Png\rgb-16-tRNS.png = tests\Images\Input\Png\rgb-16-tRNS.png
-		tests\Images\Input\Png\rgb-48bpp-interlaced.png = tests\Images\Input\Png\rgb-48bpp-interlaced.png
-		tests\Images\Input\Png\rgb-48bpp.png = tests\Images\Input\Png\rgb-48bpp.png
-		tests\Images\Input\Png\rgb-8-tRNS.png = tests\Images\Input\Png\rgb-8-tRNS.png
-		tests\Images\Input\Png\rollsroyce.png = tests\Images\Input\Png\rollsroyce.png
-		tests\Images\Input\Png\SnakeGame.png = tests\Images\Input\Png\SnakeGame.png
-		tests\Images\Input\Png\splash-interlaced.png = tests\Images\Input\Png\splash-interlaced.png
-		tests\Images\Input\Png\splash.png = tests\Images\Input\Png\splash.png
-		tests\Images\Input\Png\versioning-1_1.png = tests\Images\Input\Png\versioning-1_1.png
-		tests\Images\Input\Png\versioning-1_2.png = tests\Images\Input\Png\versioning-1_2.png
-		tests\Images\Input\Png\vim16x16_1.png = tests\Images\Input\Png\vim16x16_1.png
-		tests\Images\Input\Png\vim16x16_2.png = tests\Images\Input\Png\vim16x16_2.png
-		tests\Images\Input\Png\zlib-overflow.png = tests\Images\Input\Png\zlib-overflow.png
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing.Tests", "tests\ImageSharp.Drawing.Tests\ImageSharp.Drawing.Tests.csproj", "{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing.Benchmarks", "tests\ImageSharp.Drawing.Benchmarks\ImageSharp.Drawing.Benchmarks.csproj", "{59804113-1DD4-4F80-8D06-35FF71652508}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{23859314-5693-4E6C-BE5C-80A433439D2A}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU", "src\ImageSharp.Drawing.WebGPU\ImageSharp.Drawing.WebGPU.csproj", "{061582C2-658F-40AE-A978-7D74A4EB2C0A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.ShaderGen", "src\ImageSharp.Drawing.WebGPU.ShaderGen\ImageSharp.Drawing.WebGPU.ShaderGen.csproj", "{C7606104-5D58-4670-912C-3F336606B02D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.ManualBenchmarks", "tests\ImageSharp.Drawing.ManualBenchmarks\ImageSharp.Drawing.ManualBenchmarks.csproj", "{70193989-E587-451A-AF34-4C74FEE5DA5A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUWindowDemo", "samples\WebGPUWindowDemo\WebGPUWindowDemo.csproj", "{999D90DE-6940-4693-9F80-701F2D5DB77A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x64.Build.0 = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Debug|x86.Build.0 = Debug|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.ActiveCfg = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x64.Build.0 = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E33181E-6E28-4662-A801-E2E7DC206029}.Release|x86.Build.0 = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x64.Build.0 = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6}.Release|x86.Build.0 = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x64.Build.0 = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Debug|x86.Build.0 = Debug|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x64.ActiveCfg = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x64.Build.0 = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x86.ActiveCfg = Release|Any CPU
-		{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x86.Build.0 = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x64.Build.0 = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x86.Build.0 = Debug|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x64.ActiveCfg = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x64.Build.0 = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x86.ActiveCfg = Release|Any CPU
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x86.Build.0 = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x64.Build.0 = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x86.Build.0 = Debug|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x64.ActiveCfg = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x64.Build.0 = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x86.ActiveCfg = Release|Any CPU
-		{C7606104-5D58-4670-912C-3F336606B02D}.Release|x86.Build.0 = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x64.Build.0 = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{70193989-E587-451A-AF34-4C74FEE5DA5A}.Release|x86.Build.0 = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x64.Build.0 = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Debug|x86.Build.0 = Debug|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x64.ActiveCfg = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x64.Build.0 = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x86.ActiveCfg = Release|Any CPU
-		{999D90DE-6940-4693-9F80-701F2D5DB77A}.Release|x86.Build.0 = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x64.Build.0 = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x64.ActiveCfg = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x64.Build.0 = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1799C43E-5C54-4A8F-8D64-B1475241DB0D} = {C317F1B1-D75E-4C6D-83EB-80367343E0D7}
-		{FBE8C1AD-5AEC-4514-9B64-091D8E145865} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
-		{2E33181E-6E28-4662-A801-E2E7DC206029} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{FA55F5DE-11A6-487D-ABA4-BC93A02717DD} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{9DA226A1-8656-49A8-A58A-A8B5C081AD66} = {FA55F5DE-11A6-487D-ABA4-BC93A02717DD}
-		{1A82C5F6-90E0-4E97-BE16-A825C046B493} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{EE3FB0B3-1C31-41E9-93AB-BA800560A868} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{BF8DFDC1-CEE5-4A37-B216-D3085360C776} = {EE3FB0B3-1C31-41E9-93AB-BA800560A868}
-		{DB21FED7-E8CB-4B00-9EB2-9144D32A590A} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{195BA3D3-3E9F-4BC5-AB40-5F9FEB638146} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
-		{538F0EBD-4084-4EDB-93DD-6D35B733CA48} = {195BA3D3-3E9F-4BC5-AB40-5F9FEB638146}
-		{5C9B689F-B96D-47BE-A208-C23B1B2A8570} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
-		{516A3532-6AC2-417B-AD79-9BD5D0D378A0} = {5C9B689F-B96D-47BE-A208-C23B1B2A8570}
-		{714CDEA1-9AE6-4F76-B8B1-A7DB8C1DB82F} = {5C9B689F-B96D-47BE-A208-C23B1B2A8570}
-		{6458AFCB-A159-47D5-8F2B-50C95C0915E0} = {DB21FED7-E8CB-4B00-9EB2-9144D32A590A}
-		{39F5197B-CF6C-41A5-9739-7F97E78BB104} = {6458AFCB-A159-47D5-8F2B-50C95C0915E0}
-		{E1C42A6F-913B-4A7B-B1A8-2BB62843B254} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
-		{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{59804113-1DD4-4F80-8D06-35FF71652508} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{23859314-5693-4E6C-BE5C-80A433439D2A} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
-		{061582C2-658F-40AE-A978-7D74A4EB2C0A} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{C7606104-5D58-4670-912C-3F336606B02D} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
-		{70193989-E587-451A-AF34-4C74FEE5DA5A} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
-		{999D90DE-6940-4693-9F80-701F2D5DB77A} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
-		{43A3CA46-2675-4AD4-88FC-DDC2E657F0B7} = {CC2DDE4D-58D9-4333-BBEE-B4F36E0A4070}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5F8B9D1F-CD8B-4CC5-8216-D531E25BD795}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{061582c2-658f-40ae-a978-7d74a4eb2c0a}*SharedItemsImports = 5
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2e33181e-6e28-4662-a801-e2e7dc206029}*SharedItemsImports = 5
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
-EndGlobal
diff --git a/ImageSharp.Drawing.slnx b/ImageSharp.Drawing.slnx
new file mode 100644
index 000000000..8ba71a6cd
--- /dev/null
+++ b/ImageSharp.Drawing.slnx
@@ -0,0 +1,302 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/samples/">
+    <Project Path="samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj" />
+    <Project Path="samples/WebGPUWindowDemo/WebGPUWindowDemo.csproj" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+    <Project Path="shared-infrastructure/src/SharedInfrastructure/SharedInfrastructure.shproj" />
+    <Project Path="src/ImageSharp.Drawing.WebGPU.ShaderGen/ImageSharp.Drawing.WebGPU.ShaderGen.csproj" />
+    <Project Path="src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj" />
+    <Project Path="src/ImageSharp.Drawing/ImageSharp.Drawing.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <File Path="tests/Directory.Build.props" />
+    <File Path="tests/Directory.Build.targets" />
+    <Project Path="tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj" />
+    <Project Path="tests/ImageSharp.Drawing.ManualBenchmarks/ImageSharp.Drawing.ManualBenchmarks.csproj" />
+    <Project Path="tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Images/" />
+  <Folder Name="/tests/Images/Input/" />
+  <Folder Name="/tests/Images/Input/Bmp/">
+    <File Path="tests/Images/Input/Bmp/BitmapCoreHeaderQR.bmp" />
+    <File Path="tests/Images/Input/Bmp/BITMAPV5HEADER.bmp" />
+    <File Path="tests/Images/Input/Bmp/Car.bmp" />
+    <File Path="tests/Images/Input/Bmp/F.bmp" />
+    <File Path="tests/Images/Input/Bmp/issue735.bmp" />
+    <File Path="tests/Images/Input/Bmp/neg_height.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal1.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal1p1.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal4.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal4rle.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8-0.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8gs.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8offs.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2sp.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2v1_winv2.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2v2-16.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8os2v2.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8v4.bmp" />
+    <File Path="tests/Images/Input/Bmp/pal8v5.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16-565.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16-565pal.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb16bfdef.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb24.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb32.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb32bf.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgb32bfdef.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32-1010102.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32abf.bmp" />
+    <File Path="tests/Images/Input/Bmp/rgba32h56.bmp" />
+    <File Path="tests/Images/Input/Bmp/RunLengthEncoded-inverted.bmp" />
+    <File Path="tests/Images/Input/Bmp/RunLengthEncoded.bmp" />
+    <File Path="tests/Images/Input/Bmp/test16-inverted.bmp" />
+    <File Path="tests/Images/Input/Bmp/test16.bmp" />
+    <File Path="tests/Images/Input/Bmp/test8-inverted.bmp" />
+    <File Path="tests/Images/Input/Bmp/test8.bmp" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Gif/">
+    <File Path="tests/Images/Input/Gif/base_1x4.gif" />
+    <File Path="tests/Images/Input/Gif/base_4x1.gif" />
+    <File Path="tests/Images/Input/Gif/cheers.gif" />
+    <File Path="tests/Images/Input/Gif/giphy.gif" />
+    <File Path="tests/Images/Input/Gif/kumin.gif" />
+    <File Path="tests/Images/Input/Gif/leo.gif" />
+    <File Path="tests/Images/Input/Gif/rings.gif" />
+    <File Path="tests/Images/Input/Gif/trans.gif" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Gif/issues/">
+    <File Path="tests/Images/Input/Gif/issues/issue403_baddescriptorwidth.gif" />
+    <File Path="tests/Images/Input/Gif/issues/issue405_badappextlength252-2.gif" />
+    <File Path="tests/Images/Input/Gif/issues/issue405_badappextlength252.gif" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/" />
+  <Folder Name="/tests/Images/Input/Jpg/baseline/">
+    <File Path="tests/Images/Input/Jpg/baseline/AsianCarvingLowContrast.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/badeof.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/badrst.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Calliphora.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/cmyk.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/exif.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Floorplan.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/gamma_dalai_lama_gray.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Hiyamugi.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg400jfif.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg420exif.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg420small.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/jpeg444.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Lake.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/MultiScanBaselineCMYK.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/ratio-1x1.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/Snake.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/testimgint.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/testorig.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/testorig12.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/turtle.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/ycck-subsample-1222.jpg" />
+    <File Path="tests/Images/Input/Jpg/baseline/ycck.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/baseline/JpegSnoopReports/">
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/badeof.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/badrst.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Calliphora.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/cmyk.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/exif.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Floorplan.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/gamma_dalai_lama_gray.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Hiyamugi.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg400jfif.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg420exif.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg420small.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/jpeg444.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Lake.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/MultiScanBaselineCMYK.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/ratio-1x1.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/Snake.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/testimgint.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/testorig.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/turtle.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/baseline/JpegSnoopReports/ycck.jpg.txt" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/issues/">
+    <File Path="tests/Images/Input/Jpg/issues/Issue159-MissingFF00-Progressive-Bedroom.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue159-MissingFF00-Progressive-Girl.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue178-BadCoeffsProgressive-Lemon.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue214-CriticalEOF.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue385-BadZigZag-Progressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue394-MultiHuffmanBaseline-Speakers.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue517-No-EOI-Progressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue518-Bad-RST-Progressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue520-InvalidCast.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue624-DhtHasWrongLength-Progressive-N.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue694-Decode-Exif-OutOfRange.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue695-Invalid-EOI.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue696-Resize-Exif-OutOfRange.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue721-InvalidAPP0.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue723-Ordered-Interleaved-Progressive-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue723-Ordered-Interleaved-Progressive-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue723-Ordered-Interleaved-Progressive-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/issue750-exif-load.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/issue750-exif-tranform.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/Issue845-Incorrect-Quality99.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/issue855-incorrect-colorspace.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/issues/fuzz/">
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue797-NullReferenceException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue798-AccessViolationException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue821-DivideByZeroException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue822-DivideByZeroException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue823-NullReferenceException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-D.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-E.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-F.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-G.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue824-IndexOutOfRangeException-H.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue825-ArgumentOutOfRangeException-D.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-A.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-B.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue826-ArgumentException-C.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue827-AccessViolationException.jpg" />
+    <File Path="tests/Images/Input/Jpg/issues/fuzz/Issue839-ExecutionEngineException.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/issues/JpegSnoopReports/">
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue159-MissingFF00-Progressive-Bedroom.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue159-MissingFF00-Progressive-Girl.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue178-BadCoeffsProgressive-Lemon.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue214-CriticalEOF .jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue385-BadZigZag-Progressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue394-MultiHuffmanBaseline-Speakers.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue517-No-EOI-Progressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue518-Bad-RST-Progressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue520-InvalidCast.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue624-DhtHasWrongLength-Progressive-N.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue694-Decode-Exif-OutOfRange.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue695-Invalid-EOI.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue696-Resize-Exif-OutOfRange.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue721-InvalidAPP0.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue723-Ordered-Interleaved-Progressive-A.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue723-Ordered-Interleaved-Progressive-B.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/Issue723-Ordered-Interleaved-Progressive-C.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/issue750-exif-load.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/issues/JpegSnoopReports/issue750-exif-tranform.jpg.txt" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/progressive/">
+    <File Path="tests/Images/Input/Jpg/progressive/BadEofProgressive.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/ExifUndefType.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/fb.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/Festzug.jpg" />
+    <File Path="tests/Images/Input/Jpg/progressive/progress.jpg" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Jpg/progressive/JpegSnoopReports/">
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/BadEofProgressive.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/ExifUndefType.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/fb.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/Festzug.jpg.txt" />
+    <File Path="tests/Images/Input/Jpg/progressive/JpegSnoopReports/progress.jpg.txt" />
+  </Folder>
+  <Folder Name="/tests/Images/Input/Png/">
+    <File Path="tests/Images/Input/Png/banner7-adam.png" />
+    <File Path="tests/Images/Input/Png/banner8-index.png" />
+    <File Path="tests/Images/Input/Png/big-corrupted-chunk.png" />
+    <File Path="tests/Images/Input/Png/Bike.png" />
+    <File Path="tests/Images/Input/Png/BikeGrayscale.png" />
+    <File Path="tests/Images/Input/Png/blur.png" />
+    <File Path="tests/Images/Input/Png/bpp1.png" />
+    <File Path="tests/Images/Input/Png/CalliphoraPartial.png" />
+    <File Path="tests/Images/Input/Png/CalliphoraPartialGrayscale.png" />
+    <File Path="tests/Images/Input/Png/chunklength1.png" />
+    <File Path="tests/Images/Input/Png/chunklength2.png" />
+    <File Path="tests/Images/Input/Png/cross.png" />
+    <File Path="tests/Images/Input/Png/ducky.png" />
+    <File Path="tests/Images/Input/Png/filter0.png" />
+    <File Path="tests/Images/Input/Png/filter1.png" />
+    <File Path="tests/Images/Input/Png/filter2.png" />
+    <File Path="tests/Images/Input/Png/filter3.png" />
+    <File Path="tests/Images/Input/Png/filter4.png" />
+    <File Path="tests/Images/Input/Png/filterVar.png" />
+    <File Path="tests/Images/Input/Png/gray-1-trns.png" />
+    <File Path="tests/Images/Input/Png/gray-16-tRNS-interlaced.png" />
+    <File Path="tests/Images/Input/Png/gray-16.png" />
+    <File Path="tests/Images/Input/Png/gray-2-tRNS.png" />
+    <File Path="tests/Images/Input/Png/gray-4-tRNS.png" />
+    <File Path="tests/Images/Input/Png/gray-8-tRNS.png" />
+    <File Path="tests/Images/Input/Png/gray-alpha-16.png" />
+    <File Path="tests/Images/Input/Png/gray-alpha-8.png" />
+    <File Path="tests/Images/Input/Png/gray_4bpp.png" />
+    <File Path="tests/Images/Input/Png/icon.png" />
+    <File Path="tests/Images/Input/Png/iftbbn0g01.png" />
+    <File Path="tests/Images/Input/Png/iftbbn0g02.png" />
+    <File Path="tests/Images/Input/Png/iftbbn0g04.png" />
+    <File Path="tests/Images/Input/Png/indexed.png" />
+    <File Path="tests/Images/Input/Png/interlaced.png" />
+    <File Path="tests/Images/Input/Png/kaboom.png" />
+    <File Path="tests/Images/Input/Png/low-variance.png" />
+    <File Path="tests/Images/Input/Png/palette-8bpp.png" />
+    <File Path="tests/Images/Input/Png/pd-dest.png" />
+    <File Path="tests/Images/Input/Png/pd-source.png" />
+    <File Path="tests/Images/Input/Png/pd.png" />
+    <File Path="tests/Images/Input/Png/pl.png" />
+    <File Path="tests/Images/Input/Png/pp.png" />
+    <File Path="tests/Images/Input/Png/rainbow.png" />
+    <File Path="tests/Images/Input/Png/ratio-1x4.png" />
+    <File Path="tests/Images/Input/Png/ratio-4x1.png" />
+    <File Path="tests/Images/Input/Png/rgb-16-alpha.png" />
+    <File Path="tests/Images/Input/Png/rgb-16-tRNS.png" />
+    <File Path="tests/Images/Input/Png/rgb-48bpp-interlaced.png" />
+    <File Path="tests/Images/Input/Png/rgb-48bpp.png" />
+    <File Path="tests/Images/Input/Png/rgb-8-tRNS.png" />
+    <File Path="tests/Images/Input/Png/rollsroyce.png" />
+    <File Path="tests/Images/Input/Png/SnakeGame.png" />
+    <File Path="tests/Images/Input/Png/splash-interlaced.png" />
+    <File Path="tests/Images/Input/Png/splash.png" />
+    <File Path="tests/Images/Input/Png/versioning-1_1.png" />
+    <File Path="tests/Images/Input/Png/versioning-1_2.png" />
+    <File Path="tests/Images/Input/Png/vim16x16_1.png" />
+    <File Path="tests/Images/Input/Png/vim16x16_2.png" />
+    <File Path="tests/Images/Input/Png/zlib-overflow.png" />
+  </Folder>
+  <Folder Name="/_root/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path=".gitmodules" />
+    <File Path="ci-build.ps1" />
+    <File Path="ci-pack.ps1" />
+    <File Path="ci-test.ps1" />
+    <File Path="codecov.yml" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+    <File Path="THIRD-PARTY-NOTICES" />
+  </Folder>
+  <Folder Name="/_root/.github/">
+    <File Path=".github/CONTRIBUTING.md" />
+    <File Path=".github/PULL_REQUEST_TEMPLATE.md" />
+  </Folder>
+  <Folder Name="/_root/.github/ISSUE_TEMPLATE/">
+    <File Path=".github/ISSUE_TEMPLATE/config.yml" />
+    <File Path=".github/ISSUE_TEMPLATE/oss-bug-report.yml" />
+  </Folder>
+  <Folder Name="/_root/.github/workflows/">
+    <File Path=".github/workflows/build-and-test.yml" />
+  </Folder>
+  <Properties Name="Performance">
+    <Property Name="HasPerformanceSessions" Value="true" />
+  </Properties>
+</Solution>
diff --git a/README.md b/README.md
index 49a981965..2b499be11 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ SixLabors.ImageSharp.Drawing
 
 **ImageSharp.Drawing** is a cross-platform 2D drawing library built on top of [ImageSharp](https://github.com/SixLabors/ImageSharp). It adds a rich vector drawing model for composing raster images, rendering text, shaping paths, masking image-processing operations, and targeting CPU or WebGPU-backed drawing surfaces from the same `DrawingCanvas` API.
 
-The core package targets .NET 8 and provides the default CPU backend. The optional `SixLabors.ImageSharp.Drawing.WebGPU` package adds GPU-backed rendering for native windows, external surfaces, and offscreen render targets.
+The core package targets .NET 10 and provides the default CPU backend. The optional `SixLabors.ImageSharp.Drawing.WebGPU` package adds GPU-backed rendering for native windows, external surfaces, and offscreen render targets.
 
 ## Capabilities
 
@@ -115,12 +115,12 @@ If you prefer, you can compile ImageSharp.Drawing yourself (please do and help!)
 
 - Using [Visual Studio 2022](https://visualstudio.microsoft.com/vs/)
   - Make sure you have the latest version installed
-  - Make sure you have [the .NET 8 SDK](https://www.microsoft.com/net/core#windows) installed
+  - Make sure you have [the .NET 10 SDK](https://www.microsoft.com/net/core#windows) installed
 
 Alternatively, you can work from command line and/or with a lightweight editor on **both Linux/Unix and Windows**:
 
 - [Visual Studio Code](https://code.visualstudio.com/) with [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp)
-- [the .NET 8 SDK](https://www.microsoft.com/net/core#linuxubuntu)
+- [the .NET 10 SDK](https://www.microsoft.com/net/core#linuxubuntu)
 
 To clone ImageSharp.Drawing locally, click the "Clone in [YOUR_OS]" button above or run the following git commands:
 
diff --git a/WinFormsSamples.sln b/WinFormsSamples.sln
deleted file mode 100644
index 81eb7a521..000000000
--- a/WinFormsSamples.sln
+++ /dev/null
@@ -1,105 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.4.11626.88
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{042B144E-5444-4B88-B4F2-038E54FC25D0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU", "src\ImageSharp.Drawing.WebGPU\ImageSharp.Drawing.WebGPU.csproj", "{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.ShaderGen", "src\ImageSharp.Drawing.WebGPU.ShaderGen\ImageSharp.Drawing.WebGPU.ShaderGen.csproj", "{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingBackendBenchmark", "samples\DrawingBackendBenchmark\DrawingBackendBenchmark.csproj", "{0AF23A97-CD73-409A-AA29-D214AA400AB0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUExternalSurfaceDemo", "samples\WebGPUExternalSurfaceDemo\WebGPUExternalSurfaceDemo.csproj", "{478855A1-ECEA-4DF6-9D7B-0342EA26726E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x64.Build.0 = Debug|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x86.Build.0 = Debug|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x64.ActiveCfg = Release|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x64.Build.0 = Release|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x86.ActiveCfg = Release|Any CPU
-		{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x86.Build.0 = Release|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x86.Build.0 = Debug|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x64.Build.0 = Release|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x86.Build.0 = Release|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x64.Build.0 = Debug|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x86.Build.0 = Debug|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x64.ActiveCfg = Release|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x64.Build.0 = Release|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x86.ActiveCfg = Release|Any CPU
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x86.Build.0 = Release|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x64.Build.0 = Debug|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x86.Build.0 = Debug|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x64.ActiveCfg = Release|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x64.Build.0 = Release|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x86.ActiveCfg = Release|Any CPU
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x86.Build.0 = Release|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Debug|x64.Build.0 = Debug|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Debug|x86.Build.0 = Debug|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Release|x64.ActiveCfg = Release|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Release|x64.Build.0 = Release|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Release|x86.ActiveCfg = Release|Any CPU
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{042B144E-5444-4B88-B4F2-038E54FC25D0} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-		{439C7CCB-78F0-4F24-9D7F-6D6659495DEF} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-		{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-		{0AF23A97-CD73-409A-AA29-D214AA400AB0} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
-		{478855A1-ECEA-4DF6-9D7B-0342EA26726E} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{042b144e-5444-4b88-b4f2-038e54fc25d0}*SharedItemsImports = 5
-		shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{439c7ccb-78f0-4f24-9d7f-6d6659495def}*SharedItemsImports = 5
-	EndGlobalSection
-EndGlobal
diff --git a/WinFormsSamples.slnx b/WinFormsSamples.slnx
new file mode 100644
index 000000000..ab629d308
--- /dev/null
+++ b/WinFormsSamples.slnx
@@ -0,0 +1,16 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/samples/">
+    <Project Path="samples/DrawingBackendBenchmark/DrawingBackendBenchmark.csproj" />
+    <Project Path="samples/WebGPUExternalSurfaceDemo/WebGPUExternalSurfaceDemo.csproj" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/ImageSharp.Drawing.WebGPU.ShaderGen/ImageSharp.Drawing.WebGPU.ShaderGen.csproj" />
+    <Project Path="src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj" />
+    <Project Path="src/ImageSharp.Drawing/ImageSharp.Drawing.csproj" />
+  </Folder>
+</Solution>
diff --git a/ci-build.ps1 b/ci-build.ps1
index 12ef8bbea..4546063d1 100644
--- a/ci-build.ps1
+++ b/ci-build.ps1
@@ -3,7 +3,7 @@ param(
   [string]$targetFramework
 )
 
-$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
+$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.slnx"
 
 dotnet clean $solution -c Release
 
diff --git a/ci-local.ps1 b/ci-local.ps1
index f87124a4a..697ca9e7d 100644
--- a/ci-local.ps1
+++ b/ci-local.ps1
@@ -1,11 +1,11 @@
 $env:CI = "true"
 $env:SIXLABORS_TESTING = "True"
 
-$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
+$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.slnx"
 
-# Build (ci-build.ps1 net8.0)
+# Build (ci-build.ps1 net10.0)
 dotnet clean $solution -c Release
-dotnet build $solution -c Release -f net8.0
+dotnet build $solution -c Release -f net10.0
 
 # Pack (ci-pack.ps1)
 dotnet clean $solution -c Release
diff --git a/ci-pack.ps1 b/ci-pack.ps1
index e4e638e37..30eaff7a4 100644
--- a/ci-pack.ps1
+++ b/ci-pack.ps1
@@ -1,4 +1,4 @@
-$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
+$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.slnx"
 
 dotnet clean $solution -c Release
 
diff --git a/ci-test.ps1 b/ci-test.ps1
index 467a81d7e..d76dd06cd 100644
--- a/ci-test.ps1
+++ b/ci-test.ps1
@@ -12,7 +12,7 @@ param(
 )
 
 $netFxRegex = '^net\d+'
-$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
+$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.slnx"
 
 if ($codecov -eq 'true') {
 
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..8ff67c2a0
--- /dev/null
+++ b/global.json
@@ -0,0 +1,18 @@
+// Pins the .NET SDK to major version 10 or later for all SixLabors repositories.
+// The build copies this file to consuming repositories together with .editorconfig and
+// the other shared config files (see msbuild/targets/SixLabors.Src.targets).
+{
+  "sdk": {
+    // The floor, not an exact build: resolution never selects an SDK below major 10.
+    "version": "10.0.0",
+
+    // Select the newest installed SDK at or above the floor. This spans feature bands,
+    // minor versions, and major versions, so a machine with only stable 10.0.x SDKs
+    // resolves the newest of those, and a machine with a newer SDK resolves that instead.
+    "rollForward": "latestMajor",
+
+    // Let the CLI and Visual Studio select preview SDKs when one is installed.
+    // Machines and CI lanes without a preview SDK are unaffected.
+    "allowPrerelease": true
+  }
+}
diff --git a/samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj b/samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj
index a78d3ce01..736dce768 100644
--- a/samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj
+++ b/samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj
@@ -8,12 +8,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/samples/DrawingBackendBenchmark/DrawingBackendBenchmark.csproj b/samples/DrawingBackendBenchmark/DrawingBackendBenchmark.csproj
index 44164500e..348c162a6 100644
--- a/samples/DrawingBackendBenchmark/DrawingBackendBenchmark.csproj
+++ b/samples/DrawingBackendBenchmark/DrawingBackendBenchmark.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" TreatAsLocalProperty="TargetFramework;TargetFrameworks">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/samples/WebGPUExternalSurfaceDemo/WebGPUExternalSurfaceDemo.csproj b/samples/WebGPUExternalSurfaceDemo/WebGPUExternalSurfaceDemo.csproj
index 13f26d590..760eb30ca 100644
--- a/samples/WebGPUExternalSurfaceDemo/WebGPUExternalSurfaceDemo.csproj
+++ b/samples/WebGPUExternalSurfaceDemo/WebGPUExternalSurfaceDemo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" TreatAsLocalProperty="TargetFramework;TargetFrameworks">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/samples/WebGPUWindowDemo/WebGPUWindowDemo.csproj b/samples/WebGPUWindowDemo/WebGPUWindowDemo.csproj
index 821a4bb58..8761abefe 100644
--- a/samples/WebGPUWindowDemo/WebGPUWindowDemo.csproj
+++ b/samples/WebGPUWindowDemo/WebGPUWindowDemo.csproj
@@ -9,12 +9,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/shared-infrastructure b/shared-infrastructure
index 20f15a2d4..03471c6b4 160000
--- a/shared-infrastructure
+++ b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 20f15a2d47bba9d8375b5fd34fac283336ec9a5e
+Subproject commit 03471c6b458a2c11a0b1df1f5bf2777c8c773b99
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index b1d51c34b..3e01b1fcf 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -17,30 +17,29 @@
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
 
   <!--
-    Override the WebGPU package version so it tracks the main ImageSharp.Drawing
-    version but uses a different major number (defined by WebGpuVersionMajor).
-    For example, if MinVer calculates 3.0.0-alpha.0.201 for the main project,
-    the WebGPU package becomes 1.0.0-alpha.0.201.
+    Allow independently versioned packages to track the main ImageSharp.Drawing
+    version while using a project-defined major number. For example, if MinVer
+    calculates 3.0.0-alpha.0.201 and IndependentPackageVersionMajor is 1, the
+    package version becomes 1.0.0-alpha.0.201.
     See: https://github.com/adamralph/minver#can-i-use-the-version-calculated-by-minver-for-other-purposes
   -->
   <PropertyGroup>
-    <MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
-    <WebGpuVersionMajor>1</WebGpuVersionMajor>
+    <MinVerMinimumMajorMinor>4.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
-  <Target Name="SetWebGpuVersionNumber" AfterTargets="MinVer" Condition="'$(MSBuildProjectName)' == 'ImageSharp.Drawing.WebGPU' and '$(IsContinuousIntegration)' == 'true'">
+  <Target Name="SetIndependentPackageVersionNumber" AfterTargets="MinVer" Condition="'$(IndependentPackageVersionMajor)' != '' and '$(IsContinuousIntegration)' == 'true'">
     <PropertyGroup>
-      <_WebGpuVersionPrefix>$(WebGpuVersionMajor).$(MinVerMinor).$(MinVerPatch)</_WebGpuVersionPrefix>
-      <_WebGpuPreReleaseSuffix></_WebGpuPreReleaseSuffix>
-      <_WebGpuPreReleaseSuffix Condition="'$(MinVerPreRelease)' != ''">-$(MinVerPreRelease)</_WebGpuPreReleaseSuffix>
-      <_WebGpuBuildMetadataSuffix></_WebGpuBuildMetadataSuffix>
-      <_WebGpuBuildMetadataSuffix Condition="'$(MinVerBuildMetadata)' != ''">+$(MinVerBuildMetadata)</_WebGpuBuildMetadataSuffix>
-
-      <AssemblyVersion>$(WebGpuVersionMajor).0.0.0</AssemblyVersion>
-      <FileVersion>$(WebGpuVersionMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>
-      <Version>$(_WebGpuVersionPrefix)$(_WebGpuPreReleaseSuffix)</Version>
+      <_IndependentPackageVersionPrefix>$(IndependentPackageVersionMajor).$(MinVerMinor).$(MinVerPatch)</_IndependentPackageVersionPrefix>
+      <_IndependentPackagePreReleaseSuffix></_IndependentPackagePreReleaseSuffix>
+      <_IndependentPackagePreReleaseSuffix Condition="'$(MinVerPreRelease)' != ''">-$(MinVerPreRelease)</_IndependentPackagePreReleaseSuffix>
+      <_IndependentPackageBuildMetadataSuffix></_IndependentPackageBuildMetadataSuffix>
+      <_IndependentPackageBuildMetadataSuffix Condition="'$(MinVerBuildMetadata)' != ''">+$(MinVerBuildMetadata)</_IndependentPackageBuildMetadataSuffix>
+
+      <AssemblyVersion>$(IndependentPackageVersionMajor).0.0.0</AssemblyVersion>
+      <FileVersion>$(IndependentPackageVersionMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>
+      <Version>$(_IndependentPackageVersionPrefix)$(_IndependentPackagePreReleaseSuffix)</Version>
       <PackageVersion>$(Version)</PackageVersion>
-      <InformationalVersion>$(Version)$(_WebGpuBuildMetadataSuffix)</InformationalVersion>
+      <InformationalVersion>$(Version)$(_IndependentPackageBuildMetadataSuffix)</InformationalVersion>
     </PropertyGroup>
   </Target>
 
diff --git a/src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj b/src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj
index 1d76c2052..d421450f8 100644
--- a/src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj
+++ b/src/ImageSharp.Drawing.WebGPU/ImageSharp.Drawing.WebGPU.csproj
@@ -5,6 +5,8 @@
     <AssemblyTitle>SixLabors.ImageSharp.Drawing.WebGPU</AssemblyTitle>
     <RootNamespace>SixLabors.ImageSharp.Drawing.Processing.Backends</RootNamespace>
     <PackageId>SixLabors.ImageSharp.Drawing.WebGPU</PackageId>
+    <!-- Sets this package's independent major version while MinVer supplies the remaining version components. -->
+    <IndependentPackageVersionMajor>2</IndependentPackageVersionMajor>
     <PackageIcon>sixlabors.imagesharp.drawing.128.png</PackageIcon>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp.Drawing/</RepositoryUrl>
@@ -38,12 +40,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
index 16b607598..868fc0a3d 100644
--- a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
+++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -25,12 +25,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 68991f3ce..15e3f9d17 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -19,8 +19,7 @@
   <ItemGroup>
     <!-- Test Dependencies -->
     <PackageReference Update="BenchmarkDotNet" Version="0.15.8" />
-    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
-    <PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
+    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25563.105" />
     <PackageReference Update="Moq" Version="4.20.72" />
     <PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="'$(IsOSX)'=='true'" />
     <PackageReference Update="System.Drawing.Common" Version="6.0.0" />
diff --git a/tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj b/tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj
index 67d54323f..d523b7589 100644
--- a/tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj
+++ b/tests/ImageSharp.Drawing.Benchmarks/ImageSharp.Drawing.Benchmarks.csproj
@@ -24,12 +24,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/tests/ImageSharp.Drawing.ManualBenchmarks/ImageSharp.Drawing.ManualBenchmarks.csproj b/tests/ImageSharp.Drawing.ManualBenchmarks/ImageSharp.Drawing.ManualBenchmarks.csproj
index f64758292..6be6fb607 100644
--- a/tests/ImageSharp.Drawing.ManualBenchmarks/ImageSharp.Drawing.ManualBenchmarks.csproj
+++ b/tests/ImageSharp.Drawing.ManualBenchmarks/ImageSharp.Drawing.ManualBenchmarks.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -12,12 +12,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj b/tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj
index 9f4d52b35..7d6b2249c 100644
--- a/tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj
+++ b/tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj
@@ -13,19 +13,18 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net11.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net10.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
-    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Moq" />
     <PackageReference Include="GeoJSON.Net"/>
     <PackageReference Include="System.Drawing.Common" />
diff --git a/tests/ImageSharp.Drawing.Tests/Processing/DrawingCanvasTests.cs b/tests/ImageSharp.Drawing.Tests/Processing/DrawingCanvasTests.cs
index c7e7cf10e..c92f5c0f1 100644
--- a/tests/ImageSharp.Drawing.Tests/Processing/DrawingCanvasTests.cs
+++ b/tests/ImageSharp.Drawing.Tests/Processing/DrawingCanvasTests.cs
@@ -5,7 +5,6 @@
 using SixLabors.ImageSharp.Drawing.Processing.Backends;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.Processing;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
index 35e7e0449..76272b3aa 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
@@ -3,6 +3,7 @@
 
 using System.Reflection;
 using Xunit.Sdk;
+using Xunit.v3;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
@@ -35,11 +36,22 @@ protected ImageDataAttributeBase(string memberName, PixelTypes pixelTypes, objec
 
     protected PixelTypes PixelTypes { get; }
 
+    /// <inheritdoc/>
+    public override bool SupportsDiscoveryEnumeration() => true;
+
+    /// <inheritdoc/>
+    public override ValueTask<IReadOnlyCollection<ITheoryDataRow>> GetData(MethodInfo testMethod, DisposalTracker disposalTracker)
+    {
+        IEnumerable<object[]> rows = this.GetDataRows(testMethod);
+        IReadOnlyCollection<ITheoryDataRow> result = rows.Select(row => ConvertDataRow(row)).ToList();
+        return new ValueTask<IReadOnlyCollection<ITheoryDataRow>>(result);
+    }
+
     /// <summary>Returns the data to be used to test theory.</summary>
     /// <param name="testMethod">The method that is being tested</param>
     /// <returns>One or more sets of theory data. Each invocation of the test method
     /// is represented by a single object array.</returns>
-    public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+    private IEnumerable<object[]> GetDataRows(MethodInfo testMethod)
     {
         IEnumerable<object[]> addedRows = Enumerable.Empty<object[]>().ToArray();
         if (!string.IsNullOrWhiteSpace(this.MemberName))
@@ -52,11 +64,22 @@ public override IEnumerable<object[]> GetData(MethodInfo testMethod)
                 object obj = accessor();
                 if (obj is IEnumerable<object> memberItems)
                 {
-                    addedRows = memberItems.Select(x => x as object[]);
-                    if (addedRows.Any(x => x == null))
+                    // In xunit.v3, TheoryData<T> yields ITheoryDataRow, not object[].
+                    // Call GetData to unpack the row's values.
+                    addedRows = memberItems.Select(x =>
                     {
-                        addedRows = memberItems.Select(x => new[] { x });
-                    }
+                        if (x is ITheoryDataRow row)
+                        {
+                            return row.GetData();
+                        }
+
+                        if (x is object[] array)
+                        {
+                            return array;
+                        }
+
+                        return [x];
+                    });
                 }
             }
         }
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/BasicSerializer.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/BasicSerializer.cs
index 2b61791f0..909cf7337 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/BasicSerializer.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/BasicSerializer.cs
@@ -2,7 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.ComponentModel;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 /// </summary>
 internal class BasicSerializer : IXunitSerializationInfo
 {
-    private readonly Dictionary<string, string> map = new();
+    private readonly Dictionary<string, (string Str, Type Type)> map = new();
 
     public const char Separator = ':';
 
@@ -22,9 +22,10 @@ private string DumpToString(Type type)
         using MemoryStream ms = new();
         using StreamWriter writer = new(ms);
         writer.WriteLine(type.FullName);
-        foreach (KeyValuePair<string, string> kv in this.map)
+        foreach (KeyValuePair<string, (string Str, Type Type)> kv in this.map)
         {
-            writer.WriteLine($"{kv.Key}{Separator}{kv.Value}");
+            // Format: key:TypeAssemblyQualifiedName:value
+            writer.WriteLine($"{kv.Key}{Separator}{kv.Value.Type.AssemblyQualifiedName}{Separator}{kv.Value.Str}");
         }
 
         writer.Flush();
@@ -41,8 +42,13 @@ private Type LoadDump(string dump)
         Type type = Type.GetType(reader.ReadLine());
         for (string s = reader.ReadLine(); s != null; s = reader.ReadLine())
         {
-            string[] kv = s.Split(Separator);
-            this.map[kv[0]] = kv[1];
+            // Format: key:TypeAssemblyQualifiedName:value
+            string[] parts = s.Split(Separator, 3);
+            if (parts.Length == 3)
+            {
+                Type valueType = Type.GetType(parts[1]) ?? typeof(string);
+                this.map[parts[0]] = (parts[2], valueType);
+            }
         }
 
         return type;
@@ -75,18 +81,16 @@ public void AddValue(string key, object value, Type type = null)
 
         type ??= value.GetType();
 
-        this.map[key] = TypeDescriptor.GetConverter(type).ConvertToInvariantString(value);
+        this.map[key] = (TypeDescriptor.GetConverter(type).ConvertToInvariantString(value), type);
     }
 
-    public object GetValue(string key, Type type)
+    public object GetValue(string key)
     {
-        if (!this.map.TryGetValue(key, out string str))
+        if (!this.map.TryGetValue(key, out (string Str, Type Type) entry))
         {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
+            return null;
         }
 
-        return TypeDescriptor.GetConverter(type).ConvertFromInvariantString(str);
+        return TypeDescriptor.GetConverter(entry.Type).ConvertFromInvariantString(entry.Str);
     }
-
-    public T GetValue<T>(string key) => (T)this.GetValue(key, typeof(T));
 }
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs
index 213cba8eb..fee40ee5e 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using Microsoft.DotNet.RemoteExecutor;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/FuzzyFloat.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/FuzzyFloat.cs
index c769d39e7..d1dffd020 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/FuzzyFloat.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/FuzzyFloat.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs
index b5518008c..5f3aadd54 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs
@@ -2,7 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Numerics;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BlankProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BlankProvider.cs
index 487cb0ead..297bab040 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BlankProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BlankProvider.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/FileProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/FileProvider.cs
index 2eee97968..76902052c 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/FileProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/FileProvider.cs
@@ -8,7 +8,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using IOPath = System.IO.Path;
 
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs
index 7bd3c9189..ea0a9c0d6 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs
@@ -1,9 +1,9 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 using System.Reflection;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/SolidProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/SolidProvider.cs
index 0ff20b6a7..d4fe89af0 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/SolidProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/SolidProvider.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestImageProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
index 21bca03e9..64c1bdaf2 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
@@ -8,7 +8,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
index 31f2a0e2b..8c9827494 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
@@ -4,7 +4,7 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/MeasureFixture.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/MeasureFixture.cs
index ddf89cfc6..431027616 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/MeasureFixture.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/MeasureFixture.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestEnvironment.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestEnvironment.cs
index 3750d0a9e..4385d9bfa 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestEnvironment.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestEnvironment.cs
@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests;
 
 public static partial class TestEnvironment
 {
-    private const string ImageSharpSolutionFileName = "ImageSharp.Drawing.sln";
+    private const string ImageSharpSolutionFileName = "ImageSharp.Drawing.slnx";
 
     private const string InputImagesRelativePath = @"tests\Images\Input";
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPixel.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPixel.cs
index 5336e37a3..bbbe362ae 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPixel.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPixel.cs
@@ -3,7 +3,7 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPoint.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPoint.cs
index 74710b3aa..59c72b5c0 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPoint.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestPoint.cs
@@ -2,7 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Numerics;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestSize.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestSize.cs
index 3a2882ecd..517994d49 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestSize.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestSize.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestType.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestType.cs
index 82b2d8b62..d16517a55 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestType.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestType.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestVector4.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestVector4.cs
index cb5744ccd..b4e889533 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestVector4.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestVector4.cs
@@ -2,7 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Numerics;
-using Xunit.Abstractions;
+using Xunit.Sdk;
 
 namespace SixLabors.ImageSharp.Drawing.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/ImageComparerTests.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/ImageComparerTests.cs
index f86130247..f3f5d3b7e 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/ImageComparerTests.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/ImageComparerTests.cs
@@ -5,7 +5,6 @@
 using SixLabors.ImageSharp.Drawing.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestEnvironmentTests.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestEnvironmentTests.cs
index e1c7cf166..91a81d0c2 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestEnvironmentTests.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestEnvironmentTests.cs
@@ -6,7 +6,6 @@
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
-using Xunit.Abstractions;
 using IOPath = System.IO.Path;
 
 // ReSharper disable InconsistentNaming
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestImageProviderTests.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestImageProviderTests.cs
index 9b61dc965..648924fc3 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestImageProviderTests.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestImageProviderTests.cs
@@ -6,7 +6,6 @@
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
-using Xunit.Abstractions;
 
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Drawing.Tests;
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
index 215d18cf6..b6945fd78 100644
--- a/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
+++ b/tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
@@ -5,7 +5,6 @@
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
diff --git a/tests/ImageSharp.Drawing.Tests/ValidateDisposedMemoryAllocationsAttribute.cs b/tests/ImageSharp.Drawing.Tests/ValidateDisposedMemoryAllocationsAttribute.cs
index 471cac0cd..354083ba2 100644
--- a/tests/ImageSharp.Drawing.Tests/ValidateDisposedMemoryAllocationsAttribute.cs
+++ b/tests/ImageSharp.Drawing.Tests/ValidateDisposedMemoryAllocationsAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Reflection;
-using Xunit.Sdk;
+using Xunit.v3;
 
 namespace SixLabors.ImageSharp.Drawing.Tests;
 
@@ -19,10 +19,10 @@ public ValidateDisposedMemoryAllocationsAttribute()
     public ValidateDisposedMemoryAllocationsAttribute(int expected)
         => this.expected = expected;
 
-    public override void Before(MethodInfo methodUnderTest)
+    public override void Before(MethodInfo methodUnderTest, IXunitTest test)
         => MemoryAllocatorValidator.MonitorAllocations();
 
-    public override void After(MethodInfo methodUnderTest)
+    public override void After(MethodInfo methodUnderTest, IXunitTest test)
     {
         MemoryAllocatorValidator.ValidateAllocations(this.expected);
         MemoryAllocatorValidator.StopMonitoringAllocations();