update SixLabors

Author: dansiegel

Packages.props

@@ -6,6 +6,15 @@
     <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Update="NuGet.Build.Packaging" Version="0.2.5-dev.10" />
     <PackageReference Update="Microsoft.Web.Xdt" Version="3.0.0" />
+
+    <PackageReference Update="SixLabors.ImageSharp" Version="1.0.3" />
+    <PackageReference Update="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
+    <PackageReference Update="SixLabors.Fonts" Version="1.0.0-beta0013" />
+
+    <PackageReference Update="System.Buffers" Version="4.5.1" />
+    <PackageReference Update="System.Memory" Version="4.5.4" />
+    <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

assets/runtime/Microsoft.VisualStudio.Setup.Configuration.Interop.dll

@@ -8,14 +8,14 @@ namespace Mobile.BuildTools.Drawing
 {
     internal static class ColorUtils
     {
-        private static readonly Dictionary<string, Rgba32> namedColors = typeof(Rgba32).GetFields(BindingFlags.Public | BindingFlags.Static)
-                   .Where(x => x.FieldType == typeof(Rgba32))
-                   .ToDictionary(x => x.Name, x => (Rgba32)x.GetValue(null));
+        private static readonly Dictionary<string, Color> namedColors = typeof(Color).GetFields(BindingFlags.Public | BindingFlags.Static)
+                   .Where(x => x.FieldType == typeof(Color))
+                   .ToDictionary(x => x.Name, x => (Color)x.GetValue(null));
 
         public static bool TryParse(string input, out Color result)
         {
             result = default;
-
+
             if (string.IsNullOrWhiteSpace(input))
             {
                 return false;
@@ -28,7 +28,7 @@ public static bool TryParse(string input, out Color result)
 
             try
             {
-                result = Rgba32.FromHex(input);
+                result = Rgba32.ParseHex(input);
                 return true;
             }
             catch

assets/runtime/SixLabors.Core.dll

@@ -1,7 +1,4 @@
-using System;
-using System.Globalization;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
@@ -28,8 +25,8 @@ public static bool HasTransparentBackground(this Image image)
         }
 
         public static void ApplyBackground(this IImageProcessingContext context, string hexColor)
-        {
-            var color = ColorUtils.TryParse(hexColor, out var x) ? x : Color.FromHex(Constants.DefaultBackgroundColor);
+        {
+            var color = ColorUtils.TryParse(hexColor, out var x) ? x : Color.ParseHex(Constants.DefaultBackgroundColor);
 
             context.BackgroundColor(color);
         }

assets/runtime/SixLabors.Fonts.dll

@@ -7,9 +7,9 @@
 using SixLabors.ImageSharp.Processing;
 using Mobile.BuildTools.Models.AppIcons;
 using SixLabors.Fonts;
-using SixLabors.Primitives;
-using SixLabors.Shapes;
-
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.Drawing;
+
 namespace Mobile.BuildTools.Drawing
 {
     public static class Watermark
@@ -97,12 +97,19 @@ private static IImageProcessingContext DrawWatermark(this IImageProcessingContex
                 WatermarkPosition.TopLeft => new PointF(imgSize.Width / 2, (imgSize.Height / 9)),
                 WatermarkPosition.TopRight => new PointF(imgSize.Width / 2, (imgSize.Height / 9)),
                 _ => new PointF(imgSize.Width / 2, imgSize.Height - (imgSize.Height / 9)),
-            };
-
-            var textGraphicOptions = new TextGraphicsOptions(true)
-            {
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
+            };
+
+            var textGraphicOptions = new TextGraphicsOptions
+            {
+                GraphicsOptions = new GraphicsOptions
+                {
+                    Antialias = true
+                },
+                TextOptions = new TextOptions
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center
+                }
             };
 
             // Apply Banner
@@ -115,8 +122,20 @@ private static IImageProcessingContext DrawWatermark(this IImageProcessingContex
         private static IImageProcessingContext DrawBanner(this IImageProcessingContext context, WatermarkSettings settings)
         {
             var imgSize = context.GetCurrentSize();
-
-            var options = new GraphicsOptions(true, PixelColorBlendingMode.Normal, PixelAlphaCompositionMode.SrcOver, 1);
+            var options = new ShapeGraphicsOptions
+            {
+                GraphicsOptions = new GraphicsOptions
+                {
+                    Antialias = true,
+                    ColorBlendingMode = PixelColorBlendingMode.Normal,
+                    BlendPercentage = 1,
+                    AlphaCompositionMode = PixelAlphaCompositionMode.SrcOver
+                },
+                ShapeOptions = new ShapeOptions
+                {
+                    IntersectionRule = IntersectionRule.Nonzero
+                }
+            };
 
             var points = new[] { new PointF(0, imgSize.Height), new PointF(imgSize.Width, imgSize.Height) };
 
@@ -140,7 +159,7 @@ private static IImageProcessingContext DrawBanner(this IImageProcessingContext c
             var fullThickness = (float)(thickness * 2);
             var pen = new Pen(brush, fullThickness);
             var polygon = new Polygon(new LinearLineSegment(points));
-
+
             return context.Draw(options, pen, polygon);
         }
     }

assets/runtime/SixLabors.ImageSharp.Drawing.dll

@@ -7,7 +7,6 @@
 using Newtonsoft.Json;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.Primitives;
 
 namespace Mobile.BuildTools.Generators.Images
 {

assets/runtime/SixLabors.ImageSharp.dll

@@ -25,8 +25,6 @@
     <None Include="*.targets;*.props" Pack="true" Kind="$(PrimaryOutputKind)" />
     <None Update="Resources\*" Pack="true" PackagePath="$(PrimaryOutputKind)/resources/%(Filename)%(Extension)" />
     <None Update="ReadMe.txt" Pack="true" PackagePath="ReadMe.txt" />
-    <None Include="../../assets/runtime/*.dll" Pack="true" Kind="$(PrimaryOutputKind)" Visible="false" />
-    <Reference Include="../../assets/runtime/*.dll" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,6 +33,13 @@
     <PackageReference Include="Newtonsoft.Json" PrivateAssets="all" />
     <PackageReference Include="NuGet.Build.Packaging" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Web.Xdt" PrivateAssets="all" />
+    <PackageReference Include="SixLabors.ImageSharp" PrivateAssets="all" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" PrivateAssets="all" />
+    <PackageReference Include="SixLabors.Fonts" PrivateAssets="all" />
+    <PackageReference Include="System.Buffers" PrivateAssets="all" />
+    <PackageReference Include="System.Memory" PrivateAssets="all" />
+    <PackageReference Include="System.Numerics.Vectors" PrivateAssets="all" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

assets/runtime/SixLabors.Shapes.dll

@@ -35,7 +35,7 @@ public void GeneratesExpectedColor(string input, Color color)
             new object[] { "Red", Color.Red },
             new object[] { "Blue", Color.Blue },
             new object[] { "OrangeRed", Color.OrangeRed },
-            new object[] { "#FF88DD", Color.FromHex("#FF88DD") },
+            new object[] { "#FF88DD", Color.ParseHex("#FF88DD") },
         };
     }
 }

assets/runtime/System.Buffers.dll

@@ -19,7 +19,16 @@
           CopyToOutputDirectory="PreserveNewest"
           Visible="false" />
     <EmbeddedResource Include="resources\*" />
-    <Reference Include="../../assets/runtime/*.dll" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SixLabors.ImageSharp" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="SixLabors.Fonts" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="System.Buffers" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="System.Memory" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="System.Numerics.Vectors" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" GeneratePathProperty="true" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>