Addressed imagesharp changes

Author: stesee

.github/dependabot.yml

@@ -16,4 +16,4 @@ updates:
       - dependency-name: "MSTest.TestAdapter"
       - dependency-name: "MSTest.TestFramework"
       - dependency-name: "Microsoft.SourceLink.GitHub"
-      - dependency-name: "ImageSharpCompare"
+      - dependency-name: "Codeuctivity.ImageSharpCompare"

OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterHandlerTests.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+using Codeuctivity.ImageSharpCompare;
 using Xunit;
 
 namespace Codeuctivity.Tests.OpenXMLWordprocessingMLToHtmlConverter
@@ -58,7 +59,7 @@ public async void ShouldTranslateWithDefaultImageHandler(string imageType, strin
             expectedImage.Position = 0;
             actualImage.Position = 0;
 
-            Assert.True(ImageSharpCompare.ImagesAreEqual(expectedImage, actualImage));
+            Assert.True(Codeuctivity.ImageSharpCompare.ImageSharpCompare.ImagesAreEqual(expectedImage, actualImage));
         }
 
         [Fact]

OpenXmlPowerTools.Tests/OpenXmlPowerTools.Tests.csproj

@@ -6,12 +6,9 @@
     <LangVersion>8.0</LangVersion>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-  </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ImageSharpCompare" Version="1.2.11" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.18" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

OpenXmlPowerTools/MetricsGetter.cs

@@ -116,7 +116,8 @@ private static int _getTextWidth(SixLabors.Fonts.FontFamily ff, SixLabors.Fonts.
             try
             {
                 var font = new SixLabors.Fonts.Font(ff, (float)sz / 2f, fs);
-                var size = SixLabors.Fonts.TextMeasurer.Measure(text, new SixLabors.Fonts.RendererOptions(font));
+                var textOptions = new SixLabors.Fonts.TextOptions(font);
+                var size = SixLabors.Fonts.TextMeasurer.Measure(text,textOptions );
 
                 return (int)size.Width;
             }

OpenXmlPowerTools/OpenXmlPowerTools.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<RepositoryUrl>https://github.com/Codeuctivity/OpenXmlPowerTools</RepositoryUrl>
@@ -49,12 +49,15 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
-		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
-		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.34.0.42011">
+		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
+		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.35.0.42613">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
+	<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+		<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
+	  </ItemGroup>
 	<ItemGroup>
 		<None Include="NugetIcon.png" Pack="true" PackagePath="\" />
 	</ItemGroup>