Skip to content

Commit

Permalink
Migrate to .Net 6
Browse files Browse the repository at this point in the history
  • Loading branch information
stop-cran committed Jan 29, 2023
1 parent 93a91d5 commit 3d44519
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down
15 changes: 7 additions & 8 deletions src/ZabbixSender.Async.csproj
Original file line number Diff line number Diff line change
@@ -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;[email protected]&gt;</Authors>
<Company>stop-cran &lt;[email protected]&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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion tests/ZabbixSender.Async.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand Down

1 comment on commit 3d44519

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage for this commit

88.69%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
src
   Formatter.cs95.79%81.25%100%98.61%141, 93, 93, 93
   NetworkStreamExtensions.cs26.67%16.67%100%25%14, 14–16, 18, 18, 18, 18, 18–20
   ProtocolException.cs100%100%100%100%
   SendData.cs100%100%100%100%
   Sender.cs87.50%100%50%91.67%32, 37
   SenderResponse.cs100%100%100%100%
   SenderResponseInfo.cs55.17%50%33.33%61.90%24–25, 34–36, 47, 51, 56, 61
   SenderSkeleton.cs85%55.56%75%96.30%36, 64, 64, 64, 64
   TaskExtensions.cs71.43%50%100%75%11–12

Please sign in to comment.