Skip to content

Commit bc0601d

Browse files
steseestesee
committed
Fixed trimmed cli version
1 parent a8b5ee2 commit bc0601d

File tree

4 files changed

+52
-50
lines changed

4 files changed

+52
-50
lines changed

‎Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
<RepositoryUrl>https://github.com/Codeuctivity/PuppeteerSharp.Renderer</RepositoryUrl>
7-
<PackageTags>HtmlToPdf HtmlToPng HTML render convert PDF PNG PuppeteerSharp HTML2PDF HTML2PNG linux windows</PackageTags>
8-
<Authors>Stefan Seeland</Authors>
9-
<Company>Codeuctivity</Company>
10-
<Version Condition="'$(CURRENT_VERSION)' != ''">$(CURRENT_VERSION)</Version>
11-
<Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
12-
<AssemblyVersion>$(Version)</AssemblyVersion>
13-
<FileVersion>$(Version)</FileVersion>
14-
<PackageVersion>$(Version)</PackageVersion>
15-
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
16-
<PackageIcon>NugetIcon.png</PackageIcon>
17-
<PackageProjectUrl>https://github.com/Codeuctivity/PuppeteerSharp.Renderer</PackageProjectUrl>
18-
<Description>Renders HTML to PNG or PDF, supports windows and linux</Description>
19-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
20-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
21-
<SignAssembly>True</SignAssembly>
22-
<Optimize Condition="'$(GITHUB_ACTIONS)' == 'true'">true</Optimize>
23-
<IncludeSymbols>true</IncludeSymbols>
24-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
25-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
27-
<Nullable>enable</Nullable>
28-
<PackageId>Codeuctivity.HtmlRenderer</PackageId>
29-
<Product>Codeuctivity.HtmlRenderer</Product>
30-
<AssemblyName>Codeuctivity.HtmlRenderer</AssemblyName>
31-
<RootNamespace>Codeuctivity.HtmlRenderer</RootNamespace>
32-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
33-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
34-
<AnalysisLevel>latest</AnalysisLevel>
35-
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
36-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
37-
<AssemblyOriginatorKeyFile>Codeuctivity.HtmlRenderer.snk</AssemblyOriginatorKeyFile>
38-
<IsTrimmable>true</IsTrimmable>
39-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<RepositoryUrl>https://github.com/Codeuctivity/PuppeteerSharp.Renderer</RepositoryUrl>
7+
<PackageTags>HtmlToPdf HtmlToPng HTML render convert PDF PNG PuppeteerSharp HTML2PDF HTML2PNG linux windows</PackageTags>
8+
<Authors>Stefan Seeland</Authors>
9+
<Company>Codeuctivity</Company>
10+
<Version Condition="'$(CURRENT_VERSION)' != ''">$(CURRENT_VERSION)</Version>
11+
<Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
12+
<AssemblyVersion>$(Version)</AssemblyVersion>
13+
<FileVersion>$(Version)</FileVersion>
14+
<PackageVersion>$(Version)</PackageVersion>
15+
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
16+
<PackageIcon>NugetIcon.png</PackageIcon>
17+
<PackageProjectUrl>https://github.com/Codeuctivity/PuppeteerSharp.Renderer</PackageProjectUrl>
18+
<Description>Renders HTML to PNG or PDF, supports windows and linux</Description>
19+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
20+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
21+
<SignAssembly>True</SignAssembly>
22+
<Optimize Condition="'$(GITHUB_ACTIONS)' == 'true'">true</Optimize>
23+
<IncludeSymbols>true</IncludeSymbols>
24+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
25+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
27+
<Nullable>enable</Nullable>
28+
<PackageId>Codeuctivity.HtmlRenderer</PackageId>
29+
<Product>Codeuctivity.HtmlRenderer</Product>
30+
<AssemblyName>Codeuctivity.HtmlRenderer</AssemblyName>
31+
<RootNamespace>Codeuctivity.HtmlRenderer</RootNamespace>
32+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
33+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
34+
<AnalysisLevel>latest</AnalysisLevel>
35+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
36+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
37+
<AssemblyOriginatorKeyFile>Codeuctivity.HtmlRenderer.snk</AssemblyOriginatorKeyFile>
38+
</PropertyGroup>
4039

41-
<ItemGroup>
42-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
43-
<PackageReference Include="PuppeteerSharp" Version="12.0.0" />
44-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
45-
<PrivateAssets>all</PrivateAssets>
46-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
47-
</PackageReference>
48-
</ItemGroup>
49-
<ItemGroup>
50-
<None Include="NugetIcon.png" Pack="true" PackagePath="\" />
51-
</ItemGroup>
40+
<ItemGroup>
41+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
42+
<PackageReference Include="PuppeteerSharp" Version="12.0.0" />
43+
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
44+
<PrivateAssets>all</PrivateAssets>
45+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
46+
</PackageReference>
47+
</ItemGroup>
48+
<ItemGroup>
49+
<None Include="NugetIcon.png" Pack="true" PackagePath="\" />
50+
</ItemGroup>
5251
</Project>

‎Codeuctivity.HtmlRenderer/Renderer.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using PuppeteerSharp;
22
using System;
3+
using System.Diagnostics.CodeAnalysis;
34
using System.IO;
45
using System.Net;
56
using System.Runtime.InteropServices;
@@ -10,6 +11,7 @@ namespace Codeuctivity.HtmlRenderer
1011
/// <summary>
1112
/// Renders HTML files
1213
/// </summary>
14+
[RequiresUnreferencedCode("This functionality is not compatible with trimming. Use 'MethodFriendlyToTrimming' instead")]
1315
public class Renderer : IAsyncDisposable, IDisposable
1416
{
1517
/// <summary>

‎Codeuctivity.HtmlRendererCli/Codeuctivity.HtmlRendererCli.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<RootNamespace>Codeuctivity.HtmlRendererCli</RootNamespace>
1010
<DebugSymbols>true</DebugSymbols>
1111
<DebugType>embedded</DebugType>
12+
<TrimMode>partial</TrimMode>
1213
</PropertyGroup>
1314

1415

‎Codeuctivity.HtmlRendererCli/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public static async Task<int> Main(string[] args)
4040
using var browserFetcher = new BrowserFetcher();
4141
Console.WriteLine($"Fetching chromium from web, to {browserFetcher.CacheDir} .... ");
4242
browserFetcher.DownloadProgressChanged += BrowserFetcher_DownloadProgressChanged;
43-
await using var chromiumRenderer = await Renderer.CreateAsync(browserFetcher);
44-
await chromiumRenderer.ConvertHtmlToPdf(inputPathDocX, outputPathHtml);
43+
using var renderer = await Renderer.CreateAsync(browserFetcher).ConfigureAwait(false);
44+
await renderer.ConvertHtmlToPdf(inputPathDocX, outputPathHtml).ConfigureAwait(false);
4545
return 0;
4646
}
4747

0 commit comments

Comments
 (0)