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.

Sign up for GitHub

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

Some house keeping #424

Merged
merged 3 commits into from
Jul 12, 2024
Merged

Some house keeping #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e76a3b
Package readme with nugget package
startnow65 Feb 10, 2024
f16beb9
Target .net7 and .net8
startnow65 Feb 10, 2024
676742c
Install ghostscript
startnow65 Feb 10, 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
2 changes: 1 addition & 1 deletion .ci/tasks/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: docker-image
source:
repository: mcr.microsoft.com/dotnet/sdk
tag: 7.0-alpine3.15-amd64
tag: 8.0.101-alpine3.18-amd64
inputs:
- name: source
params:
Expand Down
2 changes: 1 addition & 1 deletion .ci/tasks/publish-nugget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: docker-image
source:
repository: mcr.microsoft.com/dotnet/sdk
tag: 7.0-alpine3.15-amd64
tag: 8.0.101-alpine3.18-amd64
inputs:
- name: source
- name: version
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: dotnet package

on:
on:
push:
pull_request:
branches:
Expand All @@ -12,7 +12,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet: ['3.1.x','5.0.x','6.0.x','7.0.x']
dotnet:
- 3.1.x
- 5.0.x
- 6.0.x
- 7.0.x
- 8.0.x
steps:
- uses: actions/checkout@v3
- name: Setup dotnet
Expand All @@ -23,10 +28,13 @@ jobs:
5.0.x
6.0.x
7.0.x
8.0.x
- name: DotNetBuild
shell: pwsh
run: ./ci-build.ps1
- name: Install Ghostscript
run: sudo apt-get install -y ghostscript
- name: Test
run: dotnet test --no-restore --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
- name: Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v3
4 changes: 3 additions & 1 deletion MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Stefan Steiger and Contributors</Authors>
<Description>MigraDocCore.DocumentObjectModel for .NET Core MigraDocCore.DocumentObjectModel was ported from MigraDoc version 1.32</Description>
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
Expand All @@ -29,6 +30,7 @@

<ItemGroup>
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion MigraDocCore.Rendering/MigraDocCore.Rendering.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Stefan Steiger and Contributors</Authors>
<Description>MigraDocCore.Rendering for .NET Core

MigraDocCore.Rendering was ported from MigraDoc version 1.32</Description>
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
Expand All @@ -33,6 +34,7 @@ MigraDocCore.Rendering was ported from MigraDoc version 1.32</Description>

<ItemGroup>
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion PdfSharpCore.Charting/PdfSharpCore.Charting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Stefan Steiger and Contributors</Authors>
<Description>PdfSharpCore.Charting for .NET Core PdfSharpCore.Charting was ported from PdfSharp</Description>
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
Expand All @@ -29,6 +30,7 @@

<ItemGroup>
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion PdfSharpCore.Test/PdfSharpCore.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
6 changes: 4 additions & 2 deletions PdfSharpCore/PdfSharpCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Stefan Steiger and Contributors</Authors>
<Description>PdfSharp for .NET Core

PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additionally MigraDoc has been ported as well (from version 1.32). Images have been implemented with ImageSharp from https://www.nuget.org/packages/SixLabors.ImageSharp</Description>
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
Expand Down Expand Up @@ -50,9 +51,10 @@ PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additionally Mi
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta17" />
</ItemGroup>

<ItemGroup>
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>

</Project>
Loading