Skip to content

Commit

Permalink
Target .net7 and .net8
Browse files Browse the repository at this point in the history
Signed-off-by: Josiah Adenegan <[email protected]>
  • Loading branch information
startnow65 committed Feb 10, 2024
1 parent bd5eee7 commit 692c0f9
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .ci/tasks/build.yaml
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
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
12 changes: 9 additions & 3 deletions .github/workflows/build.yml
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,11 @@ jobs:
5.0.x
6.0.x
7.0.x
8.0.x
- name: DotNetBuild
shell: pwsh
run: ./ci-build.ps1
- 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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<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>
Expand Down
4 changes: 2 additions & 2 deletions MigraDocCore.Rendering/MigraDocCore.Rendering.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<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>
Expand Down
4 changes: 2 additions & 2 deletions PdfSharpCore.Charting/PdfSharpCore.Charting.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<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>
Expand Down
6 changes: 3 additions & 3 deletions PdfSharpCore/PdfSharpCore.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<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>
Expand Down Expand Up @@ -51,7 +51,7 @@ 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="" />
Expand Down

0 comments on commit 692c0f9

Please sign in to comment.