Merge pull request #135 from SixLabors/js/beta-12

Update refs and tests to match latest NuGet.

Author: JimBobSquarePants

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta13.5.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />

tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs

@@ -23,8 +23,8 @@ public class DrawTextOnImageTests
 
         private const string TestText = "Sphinx of black quartz, judge my vow\n0123456789";
 
-        private static readonly ImageComparer TextDrawingComparer = TestEnvironment.IsFramework
-            ? ImageComparer.TolerantPercentage(1e-3f) // Relax comparison on .NET Framework
+        private static readonly ImageComparer TextDrawingComparer = TestEnvironment.IsFramework || TestEnvironment.NetCoreVersion.StartsWith("2")
+            ? ImageComparer.TolerantPercentage(1e-3f) // Relax comparison on .NET Framework and .NET Core 2.x
             : ImageComparer.TolerantPercentage(1e-5f);
 
         private static readonly ImageComparer OutlinedTextDrawingComparer = ImageComparer.TolerantPercentage(5e-4f);
@@ -67,6 +67,40 @@ public void EmojiFontRendering<TPixel>(TestImageProvider<TPixel> provider, bool
               $"ColorFontsEnabled-{enableColorFonts}");
         }
 
+        [Theory]
+        [WithSolidFilledImages(400, 200, "White", PixelTypes.Rgba32)]
+        public void FallbackFontRendering<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            // https://github.com/SixLabors/Fonts/issues/171
+            var collection = new FontCollection();
+            FontFamily whitney = collection.Install(TestFontUtilities.GetPath("whitney-book.ttf"));
+            FontFamily malgun = collection.Install(TestFontUtilities.GetPath("malgun.ttf"));
+            Font font = whitney.CreateFont(25);
+
+            Color color = Color.Black;
+            const string text = "亞DARKSOUL亞";
+
+            var textGraphicOptions = new DrawingOptions
+            {
+                TextOptions =
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    FallbackFonts = { malgun },
+                    ApplyKerning = true
+                }
+            };
+
+            provider.VerifyOperation(
+              TextDrawingComparer,
+              img =>
+              {
+                  var center = new PointF(img.Width / 2, img.Height / 2);
+                  img.Mutate(i => i.DrawText(textGraphicOptions, text, font, color, center));
+              });
+        }
+
         [Theory]
         [WithSolidFilledImages(276, 336, "White", PixelTypes.Rgba32)]
         public void DoesntThrowExceptionWhenOverlappingRightEdge_Issue688<TPixel>(TestImageProvider<TPixel> provider)
@@ -249,7 +283,7 @@ public void FontShapesAreRenderedCorrectly_LargeText<TPixel>(
             string str = Repeat(" ", 78) + "THISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDS";
             sb.Append(str);
 
-            string newLines = Repeat(Environment.NewLine, 80);
+            string newLines = Repeat(Environment.NewLine, 61);
             sb.Append(newLines);
 
             for (int i = 0; i < 10; i++)

tests/ImageSharp.Drawing.Tests/ImageSharp.Drawing.Tests.csproj

@@ -23,7 +23,7 @@
     <None Update="TestFonts\*.ttf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="TestFonts\SixLaborsSampleAB.woff">
+    <None Update="TestFonts\*.woff">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="xunit.runner.json">

tests/ImageSharp.Drawing.Tests/TestFonts/malgun.ttf

@@ -24,15 +24,32 @@ public static partial class TestEnvironment
 
         private static readonly Lazy<string> SolutionDirectoryFullPathLazy = new Lazy<string>(GetSolutionDirectoryFullPathImpl);
 
-        private static readonly Lazy<bool> RunsOnCiLazy = new Lazy<bool>(
-            () => bool.TryParse(Environment.GetEnvironmentVariable("CI"), out bool isCi) && isCi);
+        private static readonly Lazy<string> NetCoreVersionLazy = new Lazy<string>(GetNetCoreVersion);
 
         internal static bool IsFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
 
+        /// <summary>
+        /// Gets the .NET Core version, if running on .NET Core, otherwise returns an empty string.
+        /// </summary>
+        internal static string NetCoreVersion => NetCoreVersionLazy.Value;
+
         /// <summary>
         /// Gets a value indicating whether test execution runs on CI.
         /// </summary>
-        internal static bool RunsOnCI => RunsOnCiLazy.Value;
+#if ENV_CI
+        internal static bool RunsOnCI => true;
+#else
+        internal static bool RunsOnCI => false;
+#endif
+
+        /// <summary>
+        /// Gets a value indicating whether test execution is running with code coverage testing enabled.
+        /// </summary>
+#if ENV_CODECOV
+        internal static bool RunsWithCodeCoverage => true;
+#else
+        internal static bool RunsWithCodeCoverage => false;
+#endif
 
         internal static string SolutionDirectoryFullPath => SolutionDirectoryFullPathLazy.Value;
 
@@ -122,5 +139,22 @@ internal static string CreateOutputDirectory(string path, params string[] pathPa
 
             return path;
         }
+
+        /// <summary>
+        /// Solution borrowed from:
+        /// https://github.com/dotnet/BenchmarkDotNet/issues/448#issuecomment-308424100
+        /// </summary>
+        private static string GetNetCoreVersion()
+        {
+            Assembly assembly = typeof(System.Runtime.GCSettings).GetTypeInfo().Assembly;
+            string[] assemblyPath = assembly.Location.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
+            int netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
+            if (netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2)
+            {
+                return assemblyPath[netCoreAppIndex + 1];
+            }
+
+            return string.Empty;
+        }
     }
 }

tests/ImageSharp.Drawing.Tests/TestFonts/whitney-book.ttf

@@ -60,7 +60,7 @@ public static Image DebugSave(
             bool appendSourceFileOrDescription = true,
             IImageEncoder encoder = null)
         {
-            if (TestEnvironment.RunsOnCI)
+            if (TestEnvironment.RunsWithCodeCoverage)
             {
                 return image;
             }
@@ -99,7 +99,7 @@ public static void DebugSave(
             object testOutputDetails = null,
             bool appendPixelTypeToFileName = true)
         {
-            if (TestEnvironment.RunsOnCI)
+            if (TestEnvironment.RunsWithCodeCoverage)
             {
                 return;
             }
@@ -120,7 +120,7 @@ public static Image<TPixel> DebugSaveMultiFrame<TPixel>(
             bool appendPixelTypeToFileName = true)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.RunsOnCI)
+            if (TestEnvironment.RunsWithCodeCoverage)
             {
                 return image;
             }