update deps & build scripts

skbkontur · Aug 3, 2020 · bca545e · bca545e
1 parent 0124e18
commit bca545e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git 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
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19554-01" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.26" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -9,14 +9,13 @@
 
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <PackageId>$(AssemblyName)</PackageId>
       <Authors>iulian.margarintescu, The Recognos Metrics.NET Team</Authors>
       <PackageDescription>The library provides support for capturing: Gauges, Counters, Meters, Histograms and Timers. This is Metrics.NET fork for SKB Kontur projects.</PackageDescription>
       <PackageTags>metrics</PackageTags>
       <RepositoryType>git</RepositoryType>
       <RepositoryUrl>https://github.com/skbkontur/Metrics.NET</RepositoryUrl>
       <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
-      <PackageReleaseNotes>$(RepositoryUrl)/releases/tag/v$(MajorMinorVersion)-release</PackageReleaseNotes>
+      <PackageReleaseNotes>$(RepositoryUrl)/releases</PackageReleaseNotes>
     </PropertyGroup>
   </Target>
 

diff --git a/Metrics.Tests/Metrics.Tests.csproj b/Metrics.Tests/Metrics.Tests.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net48;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net48;netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.9.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Metrics/Metrics.csproj b/Metrics/Metrics.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>SkbKontur.Metrics.Net</PackageId>
     <AssemblyName>SkbKontur.Metrics.Net</AssemblyName>
     <RootNamespace>Metrics</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.6.0" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
   </ItemGroup>
 
 </Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.402"
+    "version": "3.1.300"
   }
 }
diff --git 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"