From adae2a721aba41192ba2c4f46eb690948975b87c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Oct 2025 11:49:17 +0000 Subject: [PATCH 1/2] Initial plan From 1111a3b42c1a7c227fcb81973c5d8c141630bf6d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Oct 2025 11:55:25 +0000 Subject: [PATCH 2/2] Add net10.0 target framework to all projects and update CI workflow Co-authored-by: stesee <168659+stesee@users.noreply.github.com> --- .github/workflows/dotnet.yml | 32 +++++++++++-------- .../Codeuctivity.HtmlRenderer.csproj | 2 +- .../Codeuctivity.HtmlRendererCli.csproj | 2 +- .../Codeuctivity.HtmlRendererCliTests.csproj | 2 +- .../Codeuctivity.HtmlRendererTests.csproj | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 0260cf0..44beae5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -18,15 +18,17 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: | + 8.0.x + 10.0.x - name: Restore dependencies run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - name: Publish FolderProfilePortable - run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net8.0 -p:PublishProfile=FolderProfilePortable + run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net10.0 -p:PublishProfile=FolderProfilePortable - name: Publish FolderProfileWindows - run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net8.0 -p:PublishProfile=FolderProfileWindows + run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net10.0 -p:PublishProfile=FolderProfileWindows - name: Test run: dotnet test --no-build --verbosity normal --configuration Release - name: Publish Unit Test Results @@ -45,20 +47,22 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: | + 8.0.x + 10.0.x - name: Restore dependencies run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - name: Publish FolderProfilePortable - run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net8.0 -p:PublishProfile=FolderProfilePortable + run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net10.0 -p:PublishProfile=FolderProfilePortable - name: Publish FolderProfileWindows - run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net8.0 -p:PublishProfile=FolderProfileWindows + run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net10.0 -p:PublishProfile=FolderProfileWindows - name: Zip FolderProfilePortable uses: thedoctor0/zip-release@main with: type: 'zip' - directory: ./Codeuctivity.HtmlRendererCli/bin/Release/net8.0/publish/FolderProfilePortable + directory: ./Codeuctivity.HtmlRendererCli/bin/Release/net10.0/publish/FolderProfilePortable filename: 'Codeuctivity.HtmlRendererCli.Portable.zip' - name: NugetPush env: @@ -72,7 +76,7 @@ jobs: GITHUB_TOKEN: ${{ github.TOKEN }} if: env.GITHUB_TOKEN != '' run: | - gh release create ${{env.CURRENT_VERSION}} ./Codeuctivity.HtmlRenderer/bin/Release/*.*nupkg ./Codeuctivity.HtmlRendererCli/bin/Release/net8.0/publish/FolderProfilePortable/Codeuctivity.HtmlRendererCli.Portable.zip ./Codeuctivity.HtmlRendererCli/bin/Release/net8.0/publish/FolderProfileWindows/Codeuctivity.HtmlRendererCli.exe --generate-notes + gh release create ${{env.CURRENT_VERSION}} ./Codeuctivity.HtmlRenderer/bin/Release/*.*nupkg ./Codeuctivity.HtmlRendererCli/bin/Release/net10.0/publish/FolderProfilePortable/Codeuctivity.HtmlRendererCli.Portable.zip ./Codeuctivity.HtmlRendererCli/bin/Release/net10.0/publish/FolderProfileWindows/Codeuctivity.HtmlRendererCli.exe --generate-notes deployTest: if: github.ref == 'refs/heads/main' @@ -83,20 +87,22 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: | + 8.0.x + 10.0.x - name: Restore dependencies run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - name: Publish FolderProfilePortable - run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net8.0 -p:PublishProfile=FolderProfilePortable + run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net10.0 -p:PublishProfile=FolderProfilePortable - name: Publish FolderProfileWindows - run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net8.0 -p:PublishProfile=FolderProfileWindows + run: dotnet publish ./Codeuctivity.HtmlRendererCli --configuration Release -f net10.0 -p:PublishProfile=FolderProfileWindows - name: Zip FolderProfilePortable uses: thedoctor0/zip-release@main with: type: 'zip' - directory: ./Codeuctivity.HtmlRendererCli/bin/Release/net8.0/publish/FolderProfilePortable + directory: ./Codeuctivity.HtmlRendererCli/bin/Release/net10.0/publish/FolderProfilePortable filename: 'Codeuctivity.HtmlRendererCli.Portable.zip' - name: NugetPush env: @@ -112,4 +118,4 @@ jobs: GITHUB_TOKEN: ${{ github.TOKEN }} if: env.GITHUB_TOKEN != '' run: | - gh release create ${{env.CURRENT_VERSION}} ./Codeuctivity.HtmlRenderer/bin/Release/*.*nupkg ./Codeuctivity.HtmlRendererCli/bin/Release/net8.0/publish/FolderProfilePortable/Codeuctivity.HtmlRendererCli.Portable.zip ./Codeuctivity.HtmlRendererCli/bin/Release/net8.0/publish/FolderProfileWindows/Codeuctivity.HtmlRendererCli.exe --prerelease --generate-notes + gh release create ${{env.CURRENT_VERSION}} ./Codeuctivity.HtmlRenderer/bin/Release/*.*nupkg ./Codeuctivity.HtmlRendererCli/bin/Release/net10.0/publish/FolderProfilePortable/Codeuctivity.HtmlRendererCli.Portable.zip ./Codeuctivity.HtmlRendererCli/bin/Release/net10.0/publish/FolderProfileWindows/Codeuctivity.HtmlRendererCli.exe --prerelease --generate-notes diff --git a/Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj b/Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj index c7667ab..4c90ab6 100644 --- a/Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj +++ b/Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj @@ -1,7 +1,7 @@  - net8.0 + net8.0;net10.0 true https://github.com/Codeuctivity/PuppeteerSharp.Renderer HtmlToPdf HtmlToPng HTML render convert PDF PNG PuppeteerSharp HTML2PDF HTML2PNG linux windows diff --git a/Codeuctivity.HtmlRendererCli/Codeuctivity.HtmlRendererCli.csproj b/Codeuctivity.HtmlRendererCli/Codeuctivity.HtmlRendererCli.csproj index 03283fc..db6a82c 100644 --- a/Codeuctivity.HtmlRendererCli/Codeuctivity.HtmlRendererCli.csproj +++ b/Codeuctivity.HtmlRendererCli/Codeuctivity.HtmlRendererCli.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net8.0;net10.0 true AllEnabledByDefault latest diff --git a/Codeuctivity.HtmlRendererCliTests/Codeuctivity.HtmlRendererCliTests.csproj b/Codeuctivity.HtmlRendererCliTests/Codeuctivity.HtmlRendererCliTests.csproj index e92efa4..09276df 100644 --- a/Codeuctivity.HtmlRendererCliTests/Codeuctivity.HtmlRendererCliTests.csproj +++ b/Codeuctivity.HtmlRendererCliTests/Codeuctivity.HtmlRendererCliTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net8.0;net10.0 false true diff --git a/Codeuctivity.HtmlRendererTests/Codeuctivity.HtmlRendererTests.csproj b/Codeuctivity.HtmlRendererTests/Codeuctivity.HtmlRendererTests.csproj index ad29d07..696cfc7 100644 --- a/Codeuctivity.HtmlRendererTests/Codeuctivity.HtmlRendererTests.csproj +++ b/Codeuctivity.HtmlRendererTests/Codeuctivity.HtmlRendererTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net8.0;net10.0 false enable false