From 7019b4c51f1ebe8ab8a76705a4a9e500ed308a93 Mon Sep 17 00:00:00 2001 From: Serge K Date: Thu, 11 Mar 2021 17:28:50 +0700 Subject: [PATCH] feat: update Microsoft.Extensions.Diagnostics.HealthChecks to 5 --- .github/workflows/branch.yml | 4 +++- .github/workflows/master.yml | 8 ++++---- .github/workflows/production.yml | 4 +++- src/Prometheus.Client.HealthChecks.csproj | 8 ++++---- src/PrometheusHealthCheckPublisher.cs | 1 - 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 8df6130..41f091e 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -1,4 +1,4 @@ -name: CI +name: CI Branch on: push: @@ -19,6 +19,8 @@ jobs: uses: actions/checkout@v2 - name: Setup .NET Core uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - name: Restore run: dotnet restore - name: Build diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index dd2ffeb..909b2d0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1,4 +1,4 @@ -name: CI +name: CI Master on: push: @@ -15,6 +15,8 @@ jobs: uses: actions/checkout@v2 - name: Setup .NET Core uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - name: Restore run: dotnet restore - name: Build @@ -27,6 +29,4 @@ jobs: name: nupkg path: artifacts/* - name: Publish to GitHub - run: | - dotnet tool install -g gpr --no-cache -v q - gpr push "artifacts/*.nupkg" -k ${{ secrets.GH_DEPLOY_KEY }} || true + run: dotnet nuget push "artifacts/*.nupkg" -s https://nuget.pkg.github.com/PrometheusClientNet/index.json -k ${{ secrets.GH_DEPLOY_KEY }} --skip-duplicate diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 7385434..bf3e763 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -1,4 +1,4 @@ -name: CI +name: CI Production on: push: @@ -13,6 +13,8 @@ jobs: uses: actions/checkout@v2 - name: Setup .NET Core uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - name: Restore run: dotnet restore - name: Build diff --git a/src/Prometheus.Client.HealthChecks.csproj b/src/Prometheus.Client.HealthChecks.csproj index 3af1bcc..25bf95b 100644 --- a/src/Prometheus.Client.HealthChecks.csproj +++ b/src/Prometheus.Client.HealthChecks.csproj @@ -3,9 +3,9 @@ HealthChecks middleware for the Prometheus.Client 2020 © Serge K, Oleksandr Poliakov Prometheus.Client.HealthChecks - 0.3.0 + 0.4.0 Serge K, Oleksandr Poliakov - netstandard2.0;netstandard2.1;netcoreapp3.1 + netstandard2.0;netstandard2.1;net5.0 Prometheus.Client.HealthChecks Prometheus.Client.HealthChecks prometheus;metrics @@ -31,8 +31,8 @@ - + - + diff --git a/src/PrometheusHealthCheckPublisher.cs b/src/PrometheusHealthCheckPublisher.cs index 3ed20b7..c67500e 100644 --- a/src/PrometheusHealthCheckPublisher.cs +++ b/src/PrometheusHealthCheckPublisher.cs @@ -2,7 +2,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Diagnostics.HealthChecks; -using Prometheus.Client; namespace Prometheus.Client.HealthChecks {