diff --git a/Source/lib/netstandard/ZXing.Net.csproj b/Source/lib/netstandard/ZXing.Net.csproj
index 181d08ee..9de37008 100644
--- a/Source/lib/netstandard/ZXing.Net.csproj
+++ b/Source/lib/netstandard/ZXing.Net.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '16.0'">
-    <TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'"> 
-    <TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '16.0'">
+    <TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'"> 
+    <TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>0.17.0</VersionPrefix>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <VersionPrefix>0.17.0</VersionPrefix>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
     <PlatformTarget>anycpu</PlatformTarget>
     <PublicSign>true</PublicSign>
@@ -17,136 +17,136 @@
     <AssemblyOriginatorKeyFile>../../../Key/private.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PackageId>ZXing.Net</PackageId>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD1_0</DefineConstants>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.1'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD1_1</DefineConstants>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETCOREAPP3_0;WPF</DefineConstants>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETCOREAPP3_1;WPF</DefineConstants>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
-
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD1_0</DefineConstants>
+    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.1'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD1_1</DefineConstants>
+    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
+    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER;NETCOREAPP3_0;WPF</DefineConstants>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER;NETCOREAPP3_1;WPF</DefineConstants>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)'=='net9.0'">
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETSTANDARD2_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\Properties\AssemblyInfo.cs;..\renderer\IBarcodeRenderer.cs;..\renderer\PixelData.cs;..\renderer\PixelDataRenderer.cs;..\renderer\SVGRenderer.cs;..\renderer\StringRenderer.cs;..\BarcodeFormat.cs;..\BarcodeReader.ByteArray.cs;..\BarcodeReaderCustom.cs;..\BarcodeReaderGeneric.cs;..\BarcodeWriter.PixelData.cs;..\BarcodeWriter.SvgImage.cs;..\BarcodeWriterCustom.cs;..\BarcodeWriterGeneric.cs;..\BaseLuminanceSource.cs;..\Binarizer.cs;..\BinaryBitmap.cs;..\DecodeHintType.cs;..\Dimension.cs;..\EncodeHintType.cs;..\FormatException.cs;..\IBarcodeReader.cs;..\IBarcodeReader.Multiple.cs;..\IBarcodeReaderCustom.cs;..\IBarcodeReaderCustom.Multiple.cs;..\IBarcodeReaderGeneric.cs;..\IBarcodeReaderGeneric.Multiple.cs;..\IBarcodeWriter.cs;..\IBarcodeWriter.PixelData.cs;..\IBarcodeWriter.SvgImage.cs;..\IBarcodeWriterCustom.cs;..\IBarcodeWriterGeneric.cs;..\InvertedLuminanceSource.cs;..\LuminanceSource.cs;..\MultiFormatReader.cs;..\MultiFormatWriter.cs;..\PlanarYUVLuminanceSource.cs;..\Reader.cs;..\ReaderException.cs;..\Result.cs;..\ResultMetadataType.cs;..\ResultPoint.cs;..\ResultPointCallback.cs;..\RGBLuminanceSource.cs;..\SupportClass.cs;..\Writer.cs;..\WriterException.cs" />
     <Compile Include="..\aztec\**;..\client\**;..\common\**;..\datamatrix\**;..\imb\**;..\maxicode\**;..\multi\**;..\oned\**;..\pdf417\**;..\qrcode\**" Exclude="..\client\result\optional\**\*;..\common\BigInteger\**\*;bin\**;obj\**;**\*.xproj;packages\**;..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;" />
-  </ItemGroup>
-
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
-    <Compile Include="..\net2.0\Action.cs;..\net2.0\Func.cs;..\common\BigInteger\**\*;..\uwp\BrowsableAttribute.cs;..\uwp\NonSerializedAttribute.cs;..\uwp\SerializableAttribute.cs;" />
-    <Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <Compile Include="..\uwp\BrowsableAttribute.cs;..\uwp\NonSerializedAttribute.cs;..\uwp\SerializableAttribute.cs;" />
-    <Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <Compile Include="..\uwp\BrowsableAttribute.cs;..\uwp\NonSerializedAttribute.cs;..\uwp\SerializableAttribute.cs;" />
-    <Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-    <Compile Include="..\BarcodeReader.Bitmap.cs;..\BitmapLuminanceSource.cs;..\BarcodeWriter.Bitmap.cs;..\renderer\BitmapRenderer.cs" />
-    <Compile Include="..\presentation\BarcodeReader.cs;..\presentation\BarcodeReader.Extensions.cs;..\presentation\BarcodeWriter.cs;..\presentation\BarcodeWriter.Extensions.cs;..\presentation\BarcodeWriterGeometry.cs;..\presentation\BarcodeWriterGeometry.Extensions.cs;..\BitmapSourceLuminanceSource.cs;..\renderer\GeometryRenderer.cs;..\renderer\WriteableBitmapRenderer.Presentation.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-    <Compile Include="..\BarcodeReader.Bitmap.cs;..\BitmapLuminanceSource.cs;..\BarcodeWriter.Bitmap.cs;..\renderer\BitmapRenderer.cs" />
-    <Compile Include="..\presentation\BarcodeReader.cs;..\presentation\BarcodeReader.Extensions.cs;..\presentation\BarcodeWriter.cs;..\presentation\BarcodeWriter.Extensions.cs;..\presentation\BarcodeWriterGeometry.cs;..\presentation\BarcodeWriterGeometry.Extensions.cs;..\BitmapSourceLuminanceSource.cs;..\renderer\GeometryRenderer.cs;..\renderer\WriteableBitmapRenderer.Presentation.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
-  </ItemGroup>
-
-</Project>
+    <Compile Include="..\net2.0\Action.cs;..\net2.0\Func.cs;..\common\BigInteger\**\*;..\uwp\BrowsableAttribute.cs;..\uwp\NonSerializedAttribute.cs;..\uwp\SerializableAttribute.cs;" />
+    <Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
+    <Compile Include="..\uwp\BrowsableAttribute.cs;..\uwp\NonSerializedAttribute.cs;..\uwp\SerializableAttribute.cs;" />
+    <Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <Compile Include="..\uwp\BrowsableAttribute.cs;..\uwp\NonSerializedAttribute.cs;..\uwp\SerializableAttribute.cs;" />
+    <Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+    <Compile Include="..\BarcodeReader.Bitmap.cs;..\BitmapLuminanceSource.cs;..\BarcodeWriter.Bitmap.cs;..\renderer\BitmapRenderer.cs" />
+    <Compile Include="..\presentation\BarcodeReader.cs;..\presentation\BarcodeReader.Extensions.cs;..\presentation\BarcodeWriter.cs;..\presentation\BarcodeWriter.Extensions.cs;..\presentation\BarcodeWriterGeometry.cs;..\presentation\BarcodeWriterGeometry.Extensions.cs;..\BitmapSourceLuminanceSource.cs;..\renderer\GeometryRenderer.cs;..\renderer\WriteableBitmapRenderer.Presentation.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+    <Compile Include="..\BarcodeReader.Bitmap.cs;..\BitmapLuminanceSource.cs;..\BarcodeWriter.Bitmap.cs;..\renderer\BitmapRenderer.cs" />
+    <Compile Include="..\presentation\BarcodeReader.cs;..\presentation\BarcodeReader.Extensions.cs;..\presentation\BarcodeWriter.cs;..\presentation\BarcodeWriter.Extensions.cs;..\presentation\BarcodeWriterGeometry.cs;..\presentation\BarcodeWriterGeometry.Extensions.cs;..\BitmapSourceLuminanceSource.cs;..\renderer\GeometryRenderer.cs;..\renderer\WriteableBitmapRenderer.Presentation.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+    <Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
+  </ItemGroup>
+
+</Project>