Merge pull request #416 from SixLabors/js/vnext

Retarget to net10/net11 and migrate tests to xUnit v3

Author: JimBobSquarePants

.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
 ###############################################################################

.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**
 

.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 }}

ImageSharp.Drawing.All.sln

@@ -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:
 

ImageSharp.Drawing.All.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>