From 3d44519764ab17be9899665dba0fb8bcf64a8a18 Mon Sep 17 00:00:00 2001
From: stop-cran <stop-cran@ubuntu.ubuntu-domain>
Date: Mon, 30 Jan 2023 01:07:32 +0300
Subject: [PATCH] Migrate to .Net 6

---
 .github/workflows/dotnetcore.yml      |  6 +++---
 src/ZabbixSender.Async.csproj         | 15 +++++++--------
 tests/ZabbixSender.Async.Tests.csproj |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 5d15b74..d3d4e79 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 6.0.x
     - name: Build with dotnet
       run: dotnet build
     - name: Test with dotnet
@@ -32,11 +32,11 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: ./tests/coverage.info
     - name: Publish Nuget
-      uses: rohith/publish-nuget@v2
+      uses: brandedoutcast/publish-nuget@v2.5.5
       with:
         PROJECT_FILE_PATH: src/ZabbixSender.Async.csproj
         TAG_COMMIT: true
-        NUGET_KEY: ${{ secrets.NuGetAPIKey }}
+        NUGET_KEY: ${{secrets.NUGETAPIKEY}}
     - name: Print test results
       uses: EnricoMi/publish-unit-test-result-action@v1
       if: always()
diff --git a/src/ZabbixSender.Async.csproj b/src/ZabbixSender.Async.csproj
index 6e96a5a..f0e0b97 100644
--- a/src/ZabbixSender.Async.csproj
+++ b/src/ZabbixSender.Async.csproj
@@ -1,19 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <Version>1.1.0</Version>
+    <TargetFramework>net6.0</TargetFramework>
+    <Version>1.2.0-rc2</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Copyright>Apache License 2.0 (stop-cran, 2018-2021)</Copyright>
+    <Copyright>Apache License 2.0 (stop-cran, 2018-2023)</Copyright>
     <Authors>stop-cran &lt;stop-cran@list.ru&gt;</Authors>
     <Company>stop-cran &lt;stop-cran@list.ru&gt;</Company>
     <RepositoryUrl>https://github.com/stop-cran/ZabbixSender.Async</RepositoryUrl>
-    <PackageReleaseNotes>Added .Net 5.</PackageReleaseNotes>
+    <PackageReleaseNotes>Added .Net 6.</PackageReleaseNotes>
     <Description>A tool to send data to Zabbix in the same way as zabbix_sender tool. It implements Zabbix Sender Protocol 4.0.</Description>
     <DocumentationFile>ZabbixSender.Async.xml</DocumentationFile>
     <LangVersion>latest</LangVersion>
     <PackageProjectUrl>https://github.com/stop-cran/ZabbixSender.Async</PackageProjectUrl>
     <PackageLicenseFile>license.txt</PackageLicenseFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -29,10 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\license.txt">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Include="..\license.txt" Pack="true" PackagePath="\" />
+    <None Include="..\README.md" Link="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/ZabbixSender.Async.Tests.csproj b/tests/ZabbixSender.Async.Tests.csproj
index f967443..ba36cd9 100644
--- a/tests/ZabbixSender.Async.Tests.csproj
+++ b/tests/ZabbixSender.Async.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>