Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introducing net6.0 port of HtmlRenderer #200

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0e83496
Introducing net6.0 port of HtmlRenderer
Nov 20, 2022
eb1eead
Merge pull request #2 from driekus77/features/net60
mstancombe Nov 11, 2023
28506df
Adding demo app to compare, Modify PdfSharp to use Async invocation, …
mstancombe Nov 11, 2023
df4712e
Updated to .net 7, lots more work getting Skia font sizing more accur…
mstancombe Nov 12, 2023
b8bcc17
Updated remaining projects to net7, some tweaks for winforms sample.
mstancombe Nov 12, 2023
7ed7537
Update README.md
driekus77 Nov 29, 2023
1965791
Update skia dependency
mstancombe Dec 9, 2023
f1441cf
Adding build pipeline for the net6 branch to push Core and Skia.
mstancombe Dec 9, 2023
25fe939
Add project URL
mstancombe Dec 9, 2023
bc0e555
Set build scripts to net 7
mstancombe Dec 9, 2023
0ebaf37
Removed non cross plat rendering targets (Win/WPF) from default build…
mstancombe Dec 9, 2023
8c27700
Fix case issue
mstancombe Dec 9, 2023
688e6c5
Fix issue where core not published
mstancombe Dec 9, 2023
9e6cf7b
Image Fixes
mstancombe Dec 9, 2023
6541e80
Add SVG Support
mstancombe Dec 9, 2023
f4f0842
Fix issue where images not waiting for load.
mstancombe Dec 10, 2023
ca1c472
Add basic page-break 'always' support, remove default page breaking o…
mstancombe Dec 10, 2023
373fc09
Swap skia svg package
albyoo Dec 19, 2023
2d92052
Merge pull request #3 from albyoo/features/net60
mstancombe Dec 19, 2023
2c13520
Rename corner radius to border radius
albyoo Dec 19, 2023
f89f838
Update demo output to use date format yyyyMMdd
albyoo Dec 19, 2023
e11379e
Implement skia border radius
albyoo Dec 20, 2023
cee2f62
Merge pull request #4 from albyoo/features/border-radius
mstancombe Dec 20, 2023
909bb2e
Update graphics adapter to use correct calculated height
albyoo Jan 25, 2024
d99d3cf
Update skia sharp adapter to use font manager default singleton
albyoo Jan 25, 2024
6afd32d
Merge pull request #6 from albyoo/features/font-sizing
mstancombe Jan 30, 2024
fda3a68
Merge pull request #1 from mstancombe/features/net60
driekus77 Mar 13, 2024
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
26 changes: 26 additions & 0 deletions .github/workflows/build-action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#Builds on every commit to main.
name: CI Build

on:
push:
branches: [ features/net60 ]
pull_request:
branches: [ features/net60 ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: 7.0.x

- name: Restore dependencies
run: dotnet restore Source/HtmlRenderer.sln

- name: Debug Build
run: dotnet build Source/HtmlRenderer.sln --no-restore -p:Version=${{ format('0.9.{0}', github.run_number) }}
68 changes: 68 additions & 0 deletions .github/workflows/release-action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Release

on:
push:
tags: [ v* ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

#Extract the version from the github tag
- id: version
run: echo "::set-output name=version_str::`echo "${{ github.ref }}" | sed -n 's/.*v\(.*\)/\1/p'`"

- name: Create release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: TODO - Document Changes for Tagged Release
draft: true
prerelease: ${{ contains(steps.version.outputs.version_str, '-') }}

- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: 7.0.x

- name: Restore dependencies
run: dotnet restore Source/HtmlRenderer.sln

- name: Release Build
run: dotnet build --no-restore Source/HtmlRenderer.sln -c Release -p:Version=${{ steps.version.outputs.version_str }}

- name: Pack
run: dotnet pack 'Source/HtmlRenderer.sln' --include-symbols --include-source --no-build -c Release -p:Version=${{ steps.version.outputs.version_str }} -p:SymbolPackageFormat=snupkg -o dist

- name: Add Nuget Packages as Release Asset
id: upload-release-asset-core
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: dist/ThreeCS.HtmlRenderer.${{ steps.version.outputs.version_str }}.nupkg
asset_name: ThreeCS.HtmlRenderer.${{ steps.version.outputs.version_str }}.nupkg
asset_content_type: application/octet-stream

- name: Add Skia Nuget Packages as Release Asset
id: upload-release-asset-skia
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: dist/ThreeCS.HtmlRenderer.SkiaSharp.${{ steps.version.outputs.version_str }}.nupkg
asset_name: ThreeCS.HtmlRenderer.SkiaSharp.${{ steps.version.outputs.version_str }}.nupkg
asset_content_type: application/octet-stream

- name: Push to Nuget
run: dotnet nuget push dist/ThreeCS.HtmlRenderer*.${{ steps.version.outputs.version_str }}.nupkg --api-key ${{ secrets.NUGET_ORG_MSTANCOMBE_KEY }} --source https://api.nuget.org/v3/index.json
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,8 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

*.DotSettings
*.DotSettings

Source/.vs/
/Source/Demos/HtmlRenderer.Demo.Console/Output
dist/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
HTML Renderer [![Build status](https://ci.appveyor.com/api/projects/status/cm8xpf8ebt3hyi3e)](https://ci.appveyor.com/project/ArthurHub/html-renderer)
=============

## Help Wanted
## Help wanted
* Looking for a contributor(s) to take this project forward as I'm unable to continue supporting it.
* Contribute directly to the repository and update nuget packages.

Expand Down
178 changes: 0 additions & 178 deletions Source/Demo/Common/HtmlRenderer.Demo.Common.csproj

This file was deleted.

Loading