Skip to content

Commit 0172253

Browse files
Update fonts ref.
1 parent a3ecc76 commit 0172253

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

ImageSharp.Drawing.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5286
333333
EndProject
334334
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{5493F024-0A3F-420C-AC2D-05B77A36025B}"
335335
EndProject
336-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Fonts", "..\Fonts\src\SixLabors.Fonts\SixLabors.Fonts.csproj", "{36EAD456-7859-4C52-A745-E8BFBA0BC239}"
337-
EndProject
338336
Global
339337
GlobalSection(SharedMSBuildProjectFiles) = preSolution
340338
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{2e33181e-6e28-4662-a801-e2e7dc206029}*SharedItemsImports = 5
341-
..\Fonts\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{36ead456-7859-4c52-a745-e8bfba0bc239}*SharedItemsImports = 5
342339
shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems*{68a8cc40-6aed-4e96-b524-31b1158fdeea}*SharedItemsImports = 13
343340
EndGlobalSection
344341
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -362,10 +359,6 @@ Global
362359
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|Any CPU.Build.0 = Debug|Any CPU
363360
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.ActiveCfg = Release|Any CPU
364361
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.Build.0 = Release|Any CPU
365-
{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
366-
{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Debug|Any CPU.Build.0 = Debug|Any CPU
367-
{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Release|Any CPU.ActiveCfg = Release|Any CPU
368-
{36EAD456-7859-4C52-A745-E8BFBA0BC239}.Release|Any CPU.Build.0 = Release|Any CPU
369362
EndGlobalSection
370363
GlobalSection(SolutionProperties) = preSolution
371364
HideSolutionNode = FALSE

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<!--<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.15" />-->
23+
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.20" />
2424
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
2525
</ItemGroup>
2626

27-
<ItemGroup>
28-
<ProjectReference Include="..\..\..\Fonts\src\SixLabors.Fonts\SixLabors.Fonts.csproj" />
29-
</ItemGroup>
30-
3127
<Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
3228

3329
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void EmojiFontRendering<TPixel>(TestImageProvider<TPixel> provider, Color
5454
HorizontalAlignment = HorizontalAlignment.Center,
5555
VerticalAlignment = VerticalAlignment.Center,
5656
TextAlignment = TextAlignment.Center,
57-
FallbackFontFamilies = { emojiFontFamily },
57+
FallbackFontFamilies = new[] { emojiFontFamily },
5858
ColorFontSupport = colorFontSupport,
5959
Origin = new PointF(img.Width / 2, img.Height / 2)
6060
};
@@ -86,7 +86,7 @@ public void FallbackFontRendering<TPixel>(TestImageProvider<TPixel> provider)
8686
HorizontalAlignment = HorizontalAlignment.Center,
8787
VerticalAlignment = VerticalAlignment.Center,
8888
TextAlignment = TextAlignment.Center,
89-
FallbackFontFamilies = { malgun },
89+
FallbackFontFamilies = new[] { malgun },
9090
KerningMode = KerningMode.Normal,
9191
Origin = new PointF(img.Width / 2, img.Height / 2)
9292
};

0 commit comments

Comments
 (0)