Merge branch '1.8.0' into dependabot/nuget/QuestPDF-2024.3.0

christiaanderidder · Apr 22, 2024 · a3b2c46 · a3b2c46
2 parents 40662f7 + a530e63
commit a3b2c46
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,4 +8,12 @@
         <AnalysisLevel>latest</AnalysisLevel>
         <AnalysisMode>All</AnalysisMode>
     </PropertyGroup>
+    <!--
+        Perform a deep clean using `dotnet clean -p:deep=true` to remove obj and bin folders
+        After a deep clean make sure to restore NuGet packages
+    -->
+    <Target Name="PostClean" AfterTargets="Clean" Condition="$(Deep)==True">
+        <RemoveDir Directories="$(BaseIntermediateOutputPath)" /><!-- obj -->
+        <RemoveDir Directories="$(BaseOutputPath)" /><!-- bin -->
+    </Target>
 </Project>
diff --git a/src/QuestPDF.Markdown/MarkdownRendererOptions.cs b/src/QuestPDF.Markdown/MarkdownRendererOptions.cs
@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using QuestPDF.Helpers;
+using QuestPDF.Infrastructure;
 
 namespace QuestPDF.Markdown;
 
@@ -10,28 +11,28 @@ public class MarkdownRendererOptions
     /// </summary>
     public bool Debug { get; set; }
 
-    public string LinkTextColor { get; set; } = Colors.Blue.Medium;
-    public string MarkedTextBackgroundColor { get; set; } = Colors.Yellow.Lighten2;
+    public Color LinkTextColor { get; set; } = Colors.Blue.Medium;
+    public Color MarkedTextBackgroundColor { get; set; } = Colors.Yellow.Lighten2;
 
-    public string BlockQuoteBorderColor { get; set; } = Colors.Grey.Lighten2;
-    public string BlockQuoteTextColor { get; set; } = Colors.Grey.Darken1;
+    public Color BlockQuoteBorderColor { get; set; } = Colors.Grey.Lighten2;
+    public Color BlockQuoteTextColor { get; set; } = Colors.Grey.Darken1;
     public int BlockQuoteBorderThickness { get; set; } = 2;
 
     public string CodeFont { get; set; } = Fonts.CourierNew;
-    public string CodeBlockBackground { get; set; } = Colors.Grey.Lighten4;
-    public string CodeInlineBackground { get; set; } = Colors.Grey.Lighten3;
+    public Color CodeBlockBackground { get; set; } = Colors.Grey.Lighten4;
+    public Color CodeInlineBackground { get; set; } = Colors.Grey.Lighten3;
 
     public string TaskListCheckedGlyph { get; set; } = "☑";
     public string TaskListUncheckedGlyph { get; set; } = "☐";
     public string UnicodeGlyphFont { get; set; } = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "Arial Unicode MS" : Fonts.Arial;
 
-    public string TableBorderColor { get; set; } = Colors.Grey.Lighten2;
-    public string TableEvenRowBackgroundColor { get; set; } = Colors.Grey.Lighten4;
-    public string TableOddRowBackgroundColor { get; set; } = Colors.White;
+    public Color TableBorderColor { get; set; } = Colors.Grey.Lighten2;
+    public Color TableEvenRowBackgroundColor { get; set; } = Colors.Grey.Lighten4;
+    public Color TableOddRowBackgroundColor { get; set; } = Colors.White;
     public int TableHeaderBorderThickness { get; set; } = 3;
     public int TableBorderThickness { get; set; } = 1;
 
-    public string HorizontalRuleColor { get; set; } = Colors.Grey.Lighten2;
+    public Color HorizontalRuleColor { get; set; } = Colors.Grey.Lighten2;
     public int HorizontalRuleThickness { get; set; } = 2;
 
     /// <summary>

diff --git a/src/QuestPDF.Markdown/QuestPDF.Markdown.csproj b/src/QuestPDF.Markdown/QuestPDF.Markdown.csproj
@@ -19,7 +19,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Markdig" Version="0.36.2"/>
+        <PackageReference Include="Markdig" Version="0.36.2" />
         <PackageReference Include="QuestPDF" Version="2024.3.0" />
         <PackageReference Include="SkiaSharp" Version="2.88.7" />
     </ItemGroup>

diff --git a/tests/QuestPDF.Markdown.Tests/QuestPDF.Markdown.Tests.csproj b/tests/QuestPDF.Markdown.Tests/QuestPDF.Markdown.Tests.csproj
@@ -13,7 +13,10 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.2"/>
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/tests/QuestPDF.Markdown.Tests/test.pdf b/tests/QuestPDF.Markdown.Tests/test.pdf