From bca545ef6e11505fffd79c2ab480c843ec99b8f3 Mon Sep 17 00:00:00 2001 From: avk Date: Mon, 3 Aug 2020 12:33:09 +0500 Subject: [PATCH] update deps & build scripts --- CHANGELOG.md | 3 +++ Directory.Build.props | 4 ++-- Directory.Build.targets | 3 +-- Metrics.Tests/Metrics.Tests.csproj | 8 ++++---- Metrics/Metrics.csproj | 3 ++- global.json | 2 +- version.json | 1 - 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46d0679f..622da44b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## v1.0.20 - 2020.08.03 +- Fixed division by zero issue in WeightedSnapshot (PR [#2](https://github.com/skbkontur/Metrics.NET/pull/2)). + ## v1.0.15 - 2019.11.13 - Use [SourceLink](https://github.com/dotnet/sourcelink) to help ReSharper decompiler show actual code. diff --git a/Directory.Build.props b/Directory.Build.props index 18865e87..7131001a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,8 +13,8 @@ - - + + diff --git a/Directory.Build.targets b/Directory.Build.targets index 46648efb..9a9a3907 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -9,14 +9,13 @@ - $(AssemblyName) iulian.margarintescu, The Recognos Metrics.NET Team The library provides support for capturing: Gauges, Counters, Meters, Histograms and Timers. This is Metrics.NET fork for SKB Kontur projects. metrics git https://github.com/skbkontur/Metrics.NET $(RepositoryUrl) - $(RepositoryUrl)/releases/tag/v$(MajorMinorVersion)-release + $(RepositoryUrl)/releases diff --git a/Metrics.Tests/Metrics.Tests.csproj b/Metrics.Tests/Metrics.Tests.csproj index cd63c19f..84278af9 100644 --- a/Metrics.Tests/Metrics.Tests.csproj +++ b/Metrics.Tests/Metrics.Tests.csproj @@ -2,14 +2,14 @@ false - net48;netcoreapp2.2 + net48;netcoreapp2.2;netcoreapp3.1 - - + + - + diff --git a/Metrics/Metrics.csproj b/Metrics/Metrics.csproj index cb5bb5ef..5b1a938f 100644 --- a/Metrics/Metrics.csproj +++ b/Metrics/Metrics.csproj @@ -2,6 +2,7 @@ netstandard2.0 + SkbKontur.Metrics.Net SkbKontur.Metrics.Net Metrics true @@ -10,7 +11,7 @@ - + \ No newline at end of file diff --git a/global.json b/global.json index 3cd92d11..9ee6c25f 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.2.402" + "version": "3.1.300" } } \ No newline at end of file diff --git a/version.json b/version.json index 09a0a989..f7415dca 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "1.0", "assemblyVersion": { "precision": "build"