Update to net8

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

@@ -19,44 +19,29 @@ jobs:
           - ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
         options:
           - os: ubuntu-latest
-            framework: net7.0
+            framework: net8.0
-            sdk: 7.0.x
+            sdk: 8.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: macos-latest
-            framework: net7.0
+            framework: net8.0
-            sdk: 7.0.x
+            sdk: 8.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: net7.0
+            framework: net8.0
-            sdk: 7.0.x
+            sdk: 8.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: buildjet-4vcpu-ubuntu-2204-arm
-            framework: net7.0
+            framework: net8.0
-            sdk: 7.0.x
+            sdk: 8.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: ubuntu-latest
-            framework: net6.0
-            sdk: 6.0.x
-            runtime: -x64
-            codecov: false
-          - os: macos-latest
-            framework: net6.0
-            sdk: 6.0.x
-            runtime: -x64
-            codecov: false
-          - os: windows-latest
-            framework: net6.0
-            sdk: 6.0.x
-            runtime: -x64
-            codecov: false
         exclude:
           - isARM: false
             options:

.github/workflows/code-coverage.yml

@@ -10,7 +10,7 @@ jobs:
       matrix:
         options:
           - os: ubuntu-latest
-            framework: net6.0
+            framework: net8.0
             runtime: -x64
             codecov: true
 

README.md

@@ -21,7 +21,7 @@ Designed to simplify image processing, ImageSharp brings you an incredibly power
 
 ImageSharp is designed from the ground up to be flexible and extensible. The library provides API endpoints for common image processing operations and the building blocks to allow for the development of additional operations.
 
-Built against [.NET 6](https://docs.microsoft.com/en-us/dotnet/standard/net-standard), ImageSharp can be used in device, cloud, and embedded/IoT scenarios.
+Built against [.NET 8](https://docs.microsoft.com/en-us/dotnet/standard/net-standard), ImageSharp can be used in device, cloud, and embedded/IoT scenarios.
 
 
 ## License
@@ -64,7 +64,7 @@ If you prefer, you can compile ImageSharp 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 7 SDK](https://www.microsoft.com/net/core#windows) installed
+  - Make sure you have [the .NET 8 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**:
 

src/ImageSharp/Common/Helpers/Numerics.cs

@@ -908,25 +908,6 @@ internal static class Numerics
         return Sse2.ConvertToInt32(vsum);
     }
 
-    /// <summary>
-    /// Reduces elements of the vector into one sum.
-    /// </summary>
-    /// <param name="accumulator">The accumulator to reduce.</param>
-    /// <returns>The sum of all elements.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static int ReduceSumArm(Vector128<uint> accumulator)
-    {
-        if (AdvSimd.Arm64.IsSupported)
-        {
-            Vector64<uint> sum = AdvSimd.Arm64.AddAcross(accumulator);
-            return (int)AdvSimd.Extract(sum, 0);
-        }
-
-        Vector128<ulong> sum2 = AdvSimd.AddPairwiseWidening(accumulator);
-        Vector64<uint> sum3 = AdvSimd.Add(sum2.GetLower().AsUInt32(), sum2.GetUpper().AsUInt32());
-        return (int)AdvSimd.Extract(sum3, 0);
-    }
-
     /// <summary>
     /// Reduces even elements of the vector into one sum.
     /// </summary>

src/ImageSharp/Diagnostics/CodeAnalysis/UnscopedRefAttribute.cs

@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-#if NET6_0
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Used to indicate a byref escapes and is not scoped.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// There are several cases where the C# compiler treats a <see langword="ref"/> as implicitly
-    /// <see langword="scoped"/> - where the compiler does not allow the <see langword="ref"/> to escape the method.
-    /// </para>
-    /// <para>
-    /// For example:
-    /// <list type="number">
-    ///     <item><see langword="this"/> for <see langword="struct"/> instance methods.</item>
-    ///     <item><see langword="ref"/> parameters that refer to <see langword="ref"/> <see langword="struct"/> types.</item>
-    ///     <item><see langword="out"/> parameters.</item>
-    /// </list>
-    /// </para>
-    /// <para>
-    /// This attribute is used in those instances where the <see langword="ref"/> should be allowed to escape.
-    /// </para>
-    /// <para>
-    /// Applying this attribute, in any form, has impact on consumers of the applicable API. It is necessary for
-    /// API authors to understand the lifetime implications of applying this attribute and how it may impact their users.
-    /// </para>
-    /// </remarks>
-    [global::System.AttributeUsage(
-        global::System.AttributeTargets.Method |
-        global::System.AttributeTargets.Property |
-        global::System.AttributeTargets.Parameter,
-        AllowMultiple = false,
-        Inherited = false)]
-    internal sealed class UnscopedRefAttribute : global::System.Attribute
-    {
-    }
-}
-#endif

src/ImageSharp/Formats/Webp/Lossy/LossyUtils.cs

@@ -230,11 +230,7 @@ internal static class LossyUtils
             }
         }
 
-#if NET7_0_OR_GREATER
         return (int)Vector128.Sum(sum);
-#else
-        return Numerics.ReduceSumArm(sum);
-#endif
     }
 
     [MethodImpl(InliningOptions.ShortMethod)]
@@ -252,11 +248,7 @@ internal static class LossyUtils
             }
         }
 
-#if NET7_0_OR_GREATER
         return (int)Vector128.Sum(sum);
-#else
-        return Numerics.ReduceSumArm(sum);
-#endif
     }
 
     [MethodImpl(InliningOptions.ShortMethod)]
@@ -275,11 +267,8 @@ internal static class LossyUtils
         Vector128<uint> sum2 = AdvSimd.AddPairwiseWidening(prod2);
 
         Vector128<uint> sum = AdvSimd.Add(sum1, sum2);
-#if NET7_0_OR_GREATER
+
         return (int)Vector128.Sum(sum);
-#else
-        return Numerics.ReduceSumArm(sum);
-#endif
     }
 
     // Load all 4x4 pixels into a single Vector128<uint>

src/ImageSharp/ImageSharp.csproj

@@ -29,13 +29,13 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <IsTrimmable>true</IsTrimmable>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <IsTrimmable>true</IsTrimmable>
       </PropertyGroup>
     </Otherwise>

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@@ -11,7 +11,7 @@
     <IsTestProject>false</IsTestProject>
     <Configurations>Debug;Release</Configurations>
     <!-- Uncomment this to run benchmarks depending on Colorful or Pfim (colorspaces and TGA): -->
-    <!--<SignAssembly>false</SignAssembly>-->    
+    <!--<SignAssembly>false</SignAssembly>-->
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,12 +23,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>

tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj

@@ -19,12 +19,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@@ -12,12 +12,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>