From 69d6a257576fb0256549aaaf7636ab8a09b0549c Mon Sep 17 00:00:00 2001
From: Yotam loewenbach <48534558+yotamloe@users.noreply.github.com>
Date: Mon, 27 May 2024 17:32:52 +0300
Subject: [PATCH] Support `net8.0` (#75)
* Add net8.0 support
* Update release.yml
* Update UnitTests.csproj
* Fix unittest matrix
---
.github/workflows/release.yml | 8 +++++++-
.github/workflows/tests.yml | 7 ++-----
src/Core/Core.csproj | 4 ++--
src/Log4netShipper/Log4netShipper.csproj | 8 ++++++--
src/NLogShipper/NLogShipper.csproj | 10 +++++++---
src/UnitTests/UnitTests.csproj | 2 +-
6 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fc60dbb..cc0a020 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,23 +1,29 @@
name: build and release a new package version
+
on:
release:
types: [published]
+
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
+
- name: Setup .NET 8.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
+
- name: Install dependencies
working-directory: ./src
run: dotnet restore logzio-dotnet.sln
+
- name: Build and release package
working-directory: ./src
run: |
+ dotnet publish -c Release -f net8.0
dotnet publish -c Release -f net6.0
- dotnet pack --configuration Release
+ dotnet pack --configuration Release -p:TargetFrameworks="net8.0;net6.0"
dotnet nuget push "./Log4netShipper/bin/Release/Logzio.DotNet.Log4net.${{ github.event.release.tag_name }}.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
dotnet nuget push "./NLogShipper/bin/Release/Logzio.DotNet.NLog.${{ github.event.release.tag_name }}.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0bcdd3c..5506e03 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,15 +6,12 @@ on:
jobs:
tests:
runs-on: ubuntu-latest
- strategy:
- matrix:
- dotnet-version: ['2.0', '3.0', '5.0', '6.0', '7.0', '8.0']
steps:
- uses: actions/checkout@v4
- - name: Setup .NET ${{ matrix.dotnet-version }}
+ - name: Setup .NET 8.0
uses: actions/setup-dotnet@v4
with:
- dotnet-version: ${{ matrix.dotnet-version }}
+ dotnet-version: 8.0
- name: Display dotnet version
run: dotnet --version
- name: Install dependencies
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 15662bd..48cbf83 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -2,7 +2,7 @@
PackageReference
- net5.0;netcoreapp3.1;netstandard1.3;netstandard2.0;net6.0
+ net5.0;netcoreapp3.1;netstandard1.3;netstandard2.0;net6.0;net8.0
9.0
Logzio.DotNet.Core
@@ -13,7 +13,7 @@
false
- 1.1.1
+ 1.2.0
diff --git a/src/Log4netShipper/Log4netShipper.csproj b/src/Log4netShipper/Log4netShipper.csproj
index dd5efd4..14d9073 100644
--- a/src/Log4netShipper/Log4netShipper.csproj
+++ b/src/Log4netShipper/Log4netShipper.csproj
@@ -1,6 +1,6 @@
- net5.0;netcoreapp3.1;netstandard1.3;netstandard2.0;net6.0
+ net5.0;netcoreapp3.1;netstandard1.3;netstandard2.0;net6.0;net8.0
Logzio.DotNet.Log4net
@@ -14,7 +14,7 @@
Apache-2.0
git
git://github.com/logzio/logzio-dotnet
- 1.1.1
+ 1.2.0
Option to format message as json
log4net.md
@@ -43,6 +43,10 @@
+
+
+
+
diff --git a/src/NLogShipper/NLogShipper.csproj b/src/NLogShipper/NLogShipper.csproj
index 102a5bf..226a6a1 100644
--- a/src/NLogShipper/NLogShipper.csproj
+++ b/src/NLogShipper/NLogShipper.csproj
@@ -1,6 +1,6 @@
- net5.0;netcoreapp3.1;netstandard1.3;netstandard2.0;net6.0
+ net5.0;netcoreapp3.1;netstandard1.3;netstandard2.0;net6.0;net8.0
Logzio.DotNet.NLog
@@ -14,7 +14,7 @@
Apache-2.0
git
git://github.com/logzio/logzio-dotnet
- 1.1.1
+ 1.2.0
Option to format message as json
nlog.md
@@ -28,7 +28,7 @@
-
+
@@ -43,6 +43,10 @@
+
+
+
+
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index c4d70f6..3e7231f 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -1,6 +1,6 @@
- net5.0;netcoreapp3.1;net6.0
+ net5.0;netcoreapp3.1;net6.0;net8.0;net7.0