Merge pull request #5 from AppMetrics/dev

Dependency updates

benchmarks/App.Metrics.Concurrency.Benchmarks.Runner/App.Metrics.Concurrency..Benchmarks.Runner.csproj

@@ -18,7 +18,6 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <PackageReference Include="BenchmarkDotNet.Core" Version="$(BenchmarkDotNetVersion)" />
   </ItemGroup>
 
   <ItemGroup>

benchmarks/App.Metrics.Concurrency.Benchmarks/App.Metrics.Concurrency.Benchmarks.csproj

@@ -12,9 +12,8 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <PackageReference Include="BenchmarkDotNet.Core" Version="$(BenchmarkDotNetVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>
 
   <ItemGroup>

benchmarks/App.Metrics.Concurrency.Benchmarks/Support/BenchmarkTestExecutor.cs

@@ -81,7 +81,7 @@ private Summary CanExecute(Type type, IConfig config = null, bool fullValidation
 
             Assert.True(
                 summary.Reports.All(r => r.BuildResult.IsBuildSuccess),
-                "The following benchmarks are failed to build: " + string.Join(", ", summary.Reports.Where(r => !r.BuildResult.IsBuildSuccess).Select(r => r.Benchmark.DisplayInfo)));
+                "The following benchmarks are failed to build: " + string.Join(", ", summary.Reports.Where(r => !r.BuildResult.IsBuildSuccess).Select(r => r.BenchmarkCase.DisplayInfo)));
 
             Assert.True(
                 summary.Reports.All(r => r.ExecuteResults.Any(er => er.FoundExecutable && er.Data.Any())),

benchmarks/App.Metrics.Concurrency.Benchmarks/Support/TestConfigs.cs

@@ -17,20 +17,20 @@ public class SingleRunFastConfig : ManualConfig
 
     public class SingleRunMediumConfig : ManualConfig
     {
-        public SingleRunMediumConfig() { Add(new Job(Job.Dry) { Run = { TargetCount = 5 } }); }
+        public SingleRunMediumConfig() { Add(new Job(Job.Dry) { Run = { IterationCount = 5 } }); }
     }
 
     public class ThroughputFastConfig : ManualConfig
     {
-        public ThroughputFastConfig() { Add(new Job(Job.Dry) { Run = { RunStrategy = RunStrategy.Throughput, TargetCount = 1 } }); }
+        public ThroughputFastConfig() { Add(new Job(Job.Dry) { Run = { RunStrategy = RunStrategy.Throughput, IterationCount = 1 } }); }
     }
 
     public class DiagnoserConfig : ManualConfig
     {
         public DiagnoserConfig()
         {
             // Diagnosers need enough runs to collects the statistics!
-            Add(new Job { Run = { LaunchCount = 1, WarmupCount = 1, TargetCount = 50 } });
+            Add(new Job { Run = { LaunchCount = 1, WarmupCount = 1, IterationCount = 50 } });
         }
     }
 #pragma warning restore SA1649, SA1402

build.cake

@@ -64,20 +64,34 @@ var coverExcludeFilter			= "-:*.Facts";
 var excludeFromCoverage			= "*.ExcludeFromCodeCoverage*";
 string versionSuffix			= null;
 
-if (!string.IsNullOrEmpty(preReleaseSuffix))
+if (AppVeyor.IsRunningOnAppVeyor)
 {
-	if (packageRelease && AppVeyor.IsRunningOnAppVeyor && AppVeyor.Environment.Repository.Tag.IsTag)
+	if (AppVeyor.Environment.Repository.Tag.IsTag)
 	{
-		versionSuffix = preReleaseSuffix;
+		// Stable release package, pushed to nuget
+	}
+	else if (string.IsNullOrEmpty(preReleaseSuffix))
+	{
+		// Next stable release development package, not pushed to nuget
+		versionSuffix = buildNumber.ToString("D4");
 	}
 	else
 	{
-		versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
+		if (packageRelease)
+		{
+			// Pre-release package, set version suffix without build number, not tagged until stable release but pushed to nuget
+			versionSuffix = preReleaseSuffix;
+		}
+		else
+		{
+			// Pre-release development package, set version suffix with build number, not pushed to nuget
+			versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
+		}
 	}
 }
-else if (AppVeyor.IsRunningOnAppVeyor && !AppVeyor.Environment.Repository.Tag.IsTag && !packageRelease)
+else
 {
-	versionSuffix = buildNumber.ToString("D4");
+	versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
 }
 
 

build/dependencies.props

@@ -1,17 +1,17 @@
 <Project>
   <PropertyGroup>
-    <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
-    <BenchmarkDotNetVersion>0.10.8</BenchmarkDotNetVersion>
+    <MicrosoftExtensionsVersion>2.1.1</MicrosoftExtensionsVersion>
+    <BenchmarkDotNetVersion>0.11.3</BenchmarkDotNetVersion>
     <CoreFxVersion>4.4.0-*</CoreFxVersion>
     <DependencyModelVersion>2.0.0-*</DependencyModelVersion>
-    <MoqVersion>4.7.49</MoqVersion>
+    <MoqVersion>4.10.0</MoqVersion>
     <NewtonsoftVersion>10.0.2</NewtonsoftVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.3.0-*</TestSdkVersion>
-    <XunitVersion>2.3.0-beta2-*</XunitVersion>
-    <FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
-    <FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
+    <TestSdkVersion>15.9.0</TestSdkVersion>
+    <XunitVersion>2.4.1</XunitVersion>
+    <FluentAssertionsVersion>5.5.3</FluentAssertionsVersion>
+    <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
   </PropertyGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test", "benchmarks" ],
   "sdk": {
-    "version": "2.1.300-preview2"
+    "version": "2.1.301"
   }
 }

src/Directory.Build.props

@@ -8,6 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" /> 
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" /> 
   </ItemGroup>
 </Project>

test/App.Metrics.Concurrency.Facts/AtomicIntegerArrayTests.cs

@@ -179,7 +179,7 @@ public void Throws_when_lenght_smaller_than_zero()
                 var unused = new AtomicIntArray(-2);
             };
 
-            action.ShouldThrow<ArgumentException>();
+            action.Should().Throw<ArgumentException>();
         }
     }
 }

test/App.Metrics.Concurrency.Facts/AtomicLongArrayTests.cs

@@ -138,7 +138,7 @@ public void Negetive_length_throws()
                 var unused = new AtomicLongArray(-1);
             };
 
-            setupAction.ShouldThrow<ArgumentException>();
+            setupAction.Should().Throw<ArgumentException>();
         }
     }
 }

version.props

@@ -1,7 +1,7 @@
 <!-- This file may be overwritten by automation. -->
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.1</VersionPrefix>
+    <VersionPrefix>2.0.2</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>