Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
# Beta Release
uses: cla-assistant/github-action@v2.2.1
uses: cla-assistant/github-action@v2.3.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# the below token should have repo scope and must be manually added by you in the repository's secret
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Publish FolderProfilePortable
run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net6.0 -p:PublishProfile=FolderProfilePortable
- name: Publish FolderProfileWindows
run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net6.0 -p:PublishProfile=FolderProfileWindows
- name: Test
run: dotnet test --no-build --verbosity normal --configuration Release
- name: Publish Unit Test Results
Expand Down Expand Up @@ -57,8 +61,10 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Publish FolderProfileWindows
- name: Publish FolderProfilePortable
run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net6.0 -p:PublishProfile=FolderProfilePortable
- name: Publish FolderProfileWindows
run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net6.0 -p:PublishProfile=FolderProfileWindows
- name: Zip FolderProfilePortable
uses: thedoctor0/zip-release@main
with:
Expand All @@ -81,6 +87,7 @@ jobs:
./Codeuctivity.HtmlRenderer/bin/Release/*.nupkg
./Codeuctivity.HtmlRenderer/bin/Release/*.snupkg
./Codeuctivity.HtmlRendererCli/bin/Release/net6.0/publish/FolderProfilePortable/Codeuctivity.HtmlRendererCli.Portable.zip
./Codeuctivity.HtmlRendererCli/bin/Release/net6.0/publish/FolderProfileWindows/Codeuctivity.HtmlRendererCli.exe

deployTest:
if: github.ref == 'refs/heads/main'
Expand All @@ -102,6 +109,8 @@ jobs:
run: dotnet build --configuration Release --no-restore
- name: Publish FolderProfilePortable
run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net6.0 -p:PublishProfile=FolderProfilePortable
- name: Publish FolderProfileWindows
run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net6.0 -p:PublishProfile=FolderProfileWindows
- name: Zip FolderProfilePortable
uses: thedoctor0/zip-release@main
with:
Expand All @@ -125,3 +134,4 @@ jobs:
./Codeuctivity.HtmlRenderer/bin/Release/*.nupkg
./Codeuctivity.HtmlRenderer/bin/Release/*.snupkg
./Codeuctivity.HtmlRendererCli/bin/Release/net6.0/publish/FolderProfilePortable/Codeuctivity.HtmlRendererCli.Portable.zip
./Codeuctivity.HtmlRendererCli/bin/Release/net6.0/publish/FolderProfileWindows/Codeuctivity.HtmlRendererCli.exe
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/stale@v7
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Stale issue message'
Expand Down
6 changes: 3 additions & 3 deletions Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net7.0;net6.0</TargetFrameworks>
Expand Down Expand Up @@ -39,8 +39,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
<PackageReference Include="PuppeteerSharp" Version="9.0.1" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060">
<PackageReference Include="PuppeteerSharp" Version="9.1.0" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Codeuctivity.HtmlRenderer/Renderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public Renderer(LaunchOptions? launchOptions = null)
/// <summary>
/// Browser fetcher - used to get chromium bins
/// </summary>
public BrowserFetcher BrowserFetcher { get; private set; }
public BrowserFetcher? BrowserFetcher { get; private set; }

private LaunchOptions LaunchOptions { get; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.76" />
<PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.155" />
<PackageReference Include="Codeuctivity.PdfjsSharp" Version="1.2.95" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060">
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion Codeuctivity.HtmlRendererTests/RendererTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public async Task ShouldConvertHtmlToPdfWithOptions(string testFileName, bool pr
}
catch (InvocationException ex)
{
// Working around issue in Jering.Javascript.NodeJS, silencing false positiv failing
// Working around issue in Jering.Javascript.NodeJS, silencing false positive failing
Assert.True(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), ex.Message);
}
}
Expand Down