Skip to content

Commit d0b0a42

Browse files
ststeigerststeiger
authored
Merge pull request #424 from startnow65/master
Some house keeping
2 parents cdf089b + 676742c commit d0b0a42

File tree

8 files changed

+27
-11
lines changed

8 files changed

+27
-11
lines changed

‎.ci/tasks/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ image_resource:
44
type: docker-image
55
source:
66
repository: mcr.microsoft.com/dotnet/sdk
7-
tag: 7.0-alpine3.15-amd64
7+
tag: 8.0.101-alpine3.18-amd64
88
inputs:
99
- name: source
1010
params:

‎.ci/tasks/publish-nugget.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ image_resource:
44
type: docker-image
55
source:
66
repository: mcr.microsoft.com/dotnet/sdk
7-
tag: 7.0-alpine3.15-amd64
7+
tag: 8.0.101-alpine3.18-amd64
88
inputs:
99
- name: source
1010
- name: version

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dotnet package
22

3-
on:
3+
on:
44
push:
55
pull_request:
66
branches:
@@ -12,7 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
dotnet: ['3.1.x','5.0.x','6.0.x','7.0.x']
15+
dotnet:
16+
- 3.1.x
17+
- 5.0.x
18+
- 6.0.x
19+
- 7.0.x
20+
- 8.0.x
1621
steps:
1722
- uses: actions/checkout@v3
1823
- name: Setup dotnet
@@ -23,10 +28,13 @@ jobs:
2328
5.0.x
2429
6.0.x
2530
7.0.x
31+
8.0.x
2632
- name: DotNetBuild
2733
shell: pwsh
2834
run: ./ci-build.ps1
35+
- name: Install Ghostscript
36+
run: sudo apt-get install -y ghostscript
2937
- name: Test
3038
run: dotnet test --no-restore --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
3139
- name: Codecov
32-
uses: codecov/codecov-action@v3
40+
uses: codecov/codecov-action@v3

‎MigraDocCore.DocumentObjectModel/MigraDocCore.DocumentObjectModel.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
44
<CheckEolTargetFramework>false</CheckEolTargetFramework>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<Authors>Stefan Steiger and Contributors</Authors>
77
<Description>MigraDocCore.DocumentObjectModel for .NET Core MigraDocCore.DocumentObjectModel was ported from MigraDoc version 1.32</Description>
88
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
9+
<PackageReadmeFile>README.md</PackageReadmeFile>
910
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
1011
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
1112
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
@@ -29,6 +30,7 @@
2930

3031
<ItemGroup>
3132
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
33+
<None Include="..\README.md" Pack="true" PackagePath="" />
3234
</ItemGroup>
3335

3436
</Project>

‎MigraDocCore.Rendering/MigraDocCore.Rendering.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
44
<CheckEolTargetFramework>false</CheckEolTargetFramework>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<Authors>Stefan Steiger and Contributors</Authors>
77
<Description>MigraDocCore.Rendering for .NET Core
88

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

3435
<ItemGroup>
3536
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
37+
<None Include="..\README.md" Pack="true" PackagePath="" />
3638
</ItemGroup>
3739

3840
</Project>

‎PdfSharpCore.Charting/PdfSharpCore.Charting.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
44
<CheckEolTargetFramework>false</CheckEolTargetFramework>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<Authors>Stefan Steiger and Contributors</Authors>
77
<Description>PdfSharpCore.Charting for .NET Core PdfSharpCore.Charting was ported from PdfSharp</Description>
88
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
9+
<PackageReadmeFile>README.md</PackageReadmeFile>
910
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
1011
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
1112
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
@@ -29,6 +30,7 @@
2930

3031
<ItemGroup>
3132
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
33+
<None Include="..\README.md" Pack="true" PackagePath="" />
3234
</ItemGroup>
3335

3436
</Project>

‎PdfSharpCore.Test/PdfSharpCore.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎PdfSharpCore/PdfSharpCore.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<Authors>Stefan Steiger and Contributors</Authors>
88
<Description>PdfSharp for .NET Core
99

1010
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>
1111
<Copyright>Copyright (c) 2005-2007 empira Software GmbH, Cologne (Germany)</Copyright>
12+
<PackageReadmeFile>README.md</PackageReadmeFile>
1213
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
1314
<PackageProjectUrl>https://github.com/ststeiger/PdfSharpCore</PackageProjectUrl>
1415
<RepositoryUrl>https://github.com/ststeiger/PdfSharpCore</RepositoryUrl>
@@ -50,9 +51,10 @@ PdfSharpCore is a partial port of PdfSharp.Xamarin for .NET Core Additionally Mi
5051
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
5152
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta17" />
5253
</ItemGroup>
53-
54+
5455
<ItemGroup>
5556
<None Include="..\LICENSE.md" Pack="true" PackagePath="" />
57+
<None Include="..\README.md" Pack="true" PackagePath="" />
5658
</ItemGroup>
5759

5860
</Project>

0 commit comments

Comments
 (0)