Migration to .NET6

Author: HeyJoel

Cofoundry.Plugins.Imaging.SkiaSharp.Tests/Shared/TestImage.cs

@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8B60
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpExample", "src\SkiaSharpExample\SkiaSharpExample.csproj", "{84AF2A45-AB3B-4AA0-91FF-F8C266E3F683}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cofoundry.Plugins.Imaging.SkiaSharp.Tests", "Cofoundry.Plugins.Imaging.SkiaSharp.Tests\Cofoundry.Plugins.Imaging.SkiaSharp.Tests.csproj", "{F8D237CF-5483-4DD8-9130-0B37DB4D5AC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cofoundry.Plugins.Imaging.SkiaSharp.Tests", "test\Cofoundry.Plugins.Imaging.SkiaSharp.Tests\Cofoundry.Plugins.Imaging.SkiaSharp.Tests.csproj", "{F8D237CF-5483-4DD8-9130-0B37DB4D5AC3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Cofoundry.Plugins.Imaging.SkiaSharp.Tests/Shared/TestImages.cs

@@ -1,5 +1,5 @@
 version: '{build}'
-image: Visual Studio 2019
+image: Visual Studio 2022
 environment:
   NUGET_API_KEY:
     secure: ZipOsavSURgYiPIWD01xFd9ug5f8/qaNNsHRwuPsqlSFrr6adAwd4yG4qgDQ6jOC

Cofoundry.Plugins.Imaging.SkiaSharp.sln

@@ -1,24 +1,20 @@
 using Cofoundry.Core.DependencyInjection;
 using Cofoundry.Domain;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace Cofoundry.Plugins.Imaging.SkiaSharp
+namespace Cofoundry.Plugins.Imaging.SkiaSharp;
+
+public class SkiaResizerDependencyRegistration : IDependencyRegistration
 {
-    public class SkiaResizerDependencyRegistration : IDependencyRegistration
+    public void Register(IContainerRegister container)
     {
-        public void Register(IContainerRegister container)
-        {
-            var overrideOptions = RegistrationOptions.Override();
+        var overrideOptions = RegistrationOptions.Override();
 
-            container
-                .Register<IImageAssetFileService, SkiaSharpImageAssetFileService>(overrideOptions)
-                .Register<IResizedImageAssetFileService, SkiaSharpResizedImageAssetFileService>(overrideOptions)
-                .Register<ISkiaSharpResizeSettingsValidator, SkiaSharpResizeSettingsValidator>()
-                .Register<IResizeSpecificationFactory, ResizeSpecificationFactory>()
-                .Register<ISkiaSharpImageResizer, SkiaSharpImageResizer>()
-                ;
-        }
+        container
+            .Register<IImageAssetFileService, SkiaSharpImageAssetFileService>(overrideOptions)
+            .Register<IResizedImageAssetFileService, SkiaSharpResizedImageAssetFileService>(overrideOptions)
+            .Register<ISkiaSharpResizeSettingsValidator, SkiaSharpResizeSettingsValidator>()
+            .Register<IResizeSpecificationFactory, ResizeSpecificationFactory>()
+            .Register<ISkiaSharpImageResizer, SkiaSharpImageResizer>()
+            ;
     }
 }

src/NuGet.Config renamed to NuGet.Config

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
 
     <PackageId>Cofoundry.Plugins.Imaging.SkiaSharp</PackageId>
     <Description>Handle image validation and resizing in Cofoundry using the SkiaSharp library.</Description>
@@ -15,13 +16,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netcoreapp3.1\Cofoundry.Plugins.Imaging.SkiaSharp.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Cofoundry.Plugins.Imaging.SkiaSharp.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cofoundry.Web" Version="0.10.0" />
-    <PackageReference Include="SkiaSharp" Version="2.80.2" />
+    <PackageReference Include="Cofoundry.Web" Version="0.10.4-ci0006" />
+    <PackageReference Include="SkiaSharp" Version="2.80.0" />
   </ItemGroup>
 
 </Project>

appveyor.yml

@@ -1,29 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace Cofoundry.Plugins.Imaging.SkiaSharp;
 
-namespace Cofoundry.Plugins.Imaging.SkiaSharp
+/// <summary>
+/// Used to indicate the bahaviour that should be applied to gifs as
+/// they are unsupported by SkiaSharp
+/// </summary>
+public enum GifResizeBehaviour
 {
     /// <summary>
-    /// Used to indicate the bahaviour that should be applied to gifs as
-    /// they are unsupported by SkiaSharp
+    /// Save single frame gifs as PNGs, but leave animated gifs untouched
+    /// and do not resize them.
     /// </summary>
-    public enum GifResizeBehaviour
-    {
-        /// <summary>
-        /// Save single frame gifs as PNGs, but leave animated gifs untouched
-        /// and do not resize them.
-        /// </summary>
-        Auto,
+    Auto,
 
-        /// <summary>
-        /// Dont resize, output the original image instead.
-        /// </summary>
-        NoResize,
+    /// <summary>
+    /// Dont resize, output the original image instead.
+    /// </summary>
+    NoResize,
 
-        /// <summary>
-        /// Re-encoded all gifs to pngs when they are uploaded.
-        /// </summary>
-        ResizeAsAlternative
-    }
+    /// <summary>
+    /// Re-encoded all gifs to pngs when they are uploaded.
+    /// </summary>
+    ResizeAsAlternative
 }

src/Cofoundry.Plugins.Imaging.SkiaSharp/Bootstrap/SkiaSharpDependencyRegistration.cs

@@ -1,38 +1,34 @@
 using Cofoundry.Core.Configuration;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Text;
 
-namespace Cofoundry.Plugins.Imaging.SkiaSharp
+namespace Cofoundry.Plugins.Imaging.SkiaSharp;
+
+/// <summary>
+/// Basic settings for image resizing behavior using SkiaSharp.
+/// </summary>
+public class SkiaSharpSettings : PluginConfigurationSettingsBase
 {
-    /// <summary>
-    /// Basic settings for image resizing behavior using SkiaSharp.
-    /// </summary>
-    public class SkiaSharpSettings : PluginConfigurationSettingsBase
+    public SkiaSharpSettings()
     {
-        public SkiaSharpSettings()
-        {
-            JpegQuality = 85;
-        }
+        JpegQuality = 85;
+    }
 
-        /// <summary>
-        /// Jpeg quality setting out of 100. Defaults to 85.
-        /// </summary>
-        [Range(0, 100)]
-        public int JpegQuality { get; set; }
+    /// <summary>
+    /// Jpeg quality setting out of 100. Defaults to 85.
+    /// </summary>
+    [Range(0, 100)]
+    public int JpegQuality { get; set; }
 
-        /// <summary>
-        /// Gifs can be saved but not resized. Use this to customize the 
-        /// fallback behaviour.
-        /// </summary>
-        public GifResizeBehaviour GifResizeBehaviour { get; set; }
+    /// <summary>
+    /// Gifs can be saved but not resized. Use this to customize the 
+    /// fallback behaviour.
+    /// </summary>
+    public GifResizeBehaviour GifResizeBehaviour { get; set; }
 
-        /// <summary>
-        /// Disables reading and writing of caching of resized image files.
-        /// Useful for debugging, but note that cache headers are still set and
-        /// files may be cached upstream.
-        /// </summary>
-        public bool DisableFileCache { get; set; }
-    }
+    /// <summary>
+    /// Disables reading and writing of caching of resized image files.
+    /// Useful for debugging, but note that cache headers are still set and
+    /// files may be cached upstream.
+    /// </summary>
+    public bool DisableFileCache { get; set; }
 }

src/Cofoundry.Plugins.Imaging.SkiaSharp/Cofoundry.Plugins.Imaging.SkiaSharp.csproj

@@ -1,34 +1,30 @@
 using Cofoundry.Domain;
 using SkiaSharp;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace Cofoundry.Plugins.Imaging.SkiaSharp
+namespace Cofoundry.Plugins.Imaging.SkiaSharp;
+
+/// <summary>
+/// Factory to produce a specification detailing the target dimensions and
+/// cropping required in a resize operation.
+/// </summary>
+public interface IResizeSpecificationFactory
 {
     /// <summary>
-    /// Factory to produce a specification detailing the target dimensions and
+    /// Produces a specification detailing the target dimensions and
     /// cropping required in a resize operation.
     /// </summary>
-    public interface IResizeSpecificationFactory
-    {
-        /// <summary>
-        /// Produces a specification detailing the target dimensions and
-        /// cropping required in a resize operation.
-        /// </summary>
-        /// <param name="sourceCodec">
-        /// The file header data from the source image file. This does not get disposed.
-        /// </param>
-        /// <param name="sourceImage">The source image pixel data. This does not get disposed.</param>
-        /// <param name="resizeSettings">
-        /// The resize settings that indicate the desired outcome and rules of the
-        /// resize operation.
-        /// </param>
-        /// <returns></returns>
-        ResizeSpecification Create(
-            SKCodec sourceCodec,
-            SKBitmap sourceImage,
-            IImageResizeSettings resizeSettings
-            );
-    }
+    /// <param name="sourceCodec">
+    /// The file header data from the source image file. This does not get disposed.
+    /// </param>
+    /// <param name="sourceImage">The source image pixel data. This does not get disposed.</param>
+    /// <param name="resizeSettings">
+    /// The resize settings that indicate the desired outcome and rules of the
+    /// resize operation.
+    /// </param>
+    /// <returns></returns>
+    ResizeSpecification Create(
+        SKCodec sourceCodec,
+        SKBitmap sourceImage,
+        IImageResizeSettings resizeSettings
+        );
 }