MarcinZiabek 3 lat temu
rodzic
commit
db9d8b5fcf

+ 1 - 2
QuestPDF.Previewer/QuestPDF.Previewer.csproj

@@ -48,8 +48,7 @@
         <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.10" />
         <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.10" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.10" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.10" />
         <PackageReference Include="ReactiveUI" Version="17.1.50" />
         <PackageReference Include="ReactiveUI" Version="17.1.50" />
-        <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.4" />
-        <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.80.4" />
+        <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.80.4" />
         <PackageReference Include="System.Reactive" Version="5.0.0" />
         <PackageReference Include="System.Reactive" Version="5.0.0" />
         <PackageReference Include="SkiaSharp" Version="2.80.4" />
         <PackageReference Include="SkiaSharp" Version="2.80.4" />
     </ItemGroup>
     </ItemGroup>

+ 4 - 4
QuestPDF/Drawing/Exceptions/InitializationException.cs

@@ -15,21 +15,21 @@ namespace QuestPDF.Drawing.Exceptions
             
             
             return $"Cannot create the {documentType} document using the {libraryName} library. " +
             return $"Cannot create the {documentType} document using the {libraryName} library. " +
                    $"This exception usually means that, on your operating system where you run the application, {libraryName} requires installing additional dependencies. " +
                    $"This exception usually means that, on your operating system where you run the application, {libraryName} requires installing additional dependencies. " +
-                   $"Such dependencies are available as additional nuget packages, for example {nugetConvention}.Linux. " +
-                   $"Some operating systems may require installing multiple nugets, e.g. MacOS may need both {nugetConvention}.macOS and {nugetConvention}.Linux." +
+                   $"Such dependencies are available as additional nuget packages, for example {nugetConvention}.Linux.NoDependencies. " +
+                   $"Some operating systems may require installing multiple nugets, e.g. MacOS may need both {nugetConvention}.macOS.NoDependencies and {nugetConvention}.Linux.NoDependencies." +
                    $"Please refer to the {libraryName} documentation for more details. " +
                    $"Please refer to the {libraryName} documentation for more details. " +
                    $"Also, please consult the inner exception that has been originally thrown by the dependency library.";
                    $"Also, please consult the inner exception that has been originally thrown by the dependency library.";
 
 
             (string GetLibraryName, string nugetConvention) GetLibraryName()
             (string GetLibraryName, string nugetConvention) GetLibraryName()
             {
             {
                 if (innerExceptionMessage.Contains("libSkiaSharp"))
                 if (innerExceptionMessage.Contains("libSkiaSharp"))
-                    return ("SkiaSharp", "SkiaSharp.NativeAssets.Linux");
+                    return ("SkiaSharp", "SkiaSharp.NativeAssets");
                 
                 
                 if (innerExceptionMessage.Contains("libHarfBuzzSharp"))
                 if (innerExceptionMessage.Contains("libHarfBuzzSharp"))
                     return ("HarfBuzzSharp", "HarfBuzzSharp.NativeAssets");
                     return ("HarfBuzzSharp", "HarfBuzzSharp.NativeAssets");
                 
                 
                 // default
                 // default
-                return ("SkiaSharp-related", "*.NativeAssets.Linux");
+                return ("SkiaSharp-related", "*.NativeAssets");
             }
             }
         }
         }
     }
     }

BIN
QuestPDF/Resources/Logo.png