Merge pull request #32 from AppMetrics/dev

2.0.0
AppMetrics · Mar 29, 2018 · b1d5bd8 · b1d5bd8
2 parents 1bd7137 + 8dc5e94
commit b1d5bd8
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 22 deletions.
diff --git a/Prometheus.sln b/Prometheus.sln
@@ -1,9 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26906.1
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D805782-756E-4C98-B22E-F502BEE95318}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{31A4DDB1-952E-4EED-96EF-29C669279A86}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,19 +2,21 @@
   <PropertyGroup>
     <AppMetricsCoreVersion>2.0.0-*</AppMetricsCoreVersion>
     <AppMetricsAspNetCoreVersion>2.0.0-*</AppMetricsAspNetCoreVersion>
-    <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
+    <AspNetCoreVersion>2.0.1</AspNetCoreVersion>
+    <AspNetCoreMvcVersion>2.0.2</AspNetCoreMvcVersion>
+    <MicrosoftExtensionsVersion>2.0.0</MicrosoftExtensionsVersion>
     <AppMetricsReportingVersion>2.0.0-*</AppMetricsReportingVersion>
-    <BenchmarkDotNetVersion>0.10.8</BenchmarkDotNetVersion>
-    <CoreFxVersion>4.4.0-*</CoreFxVersion>
-    <DependencyModelVersion>2.0.0-*</DependencyModelVersion>
-    <MoqVersion>4.7.49</MoqVersion>
-    <NewtonsoftVersion>10.0.2</NewtonsoftVersion>
+    <BenchmarkDotNetVersion>0.10.12</BenchmarkDotNetVersion>
+    <CoreFxVersion>4.4.0</CoreFxVersion>
+    <DependencyModelVersion>2.0.4</DependencyModelVersion>
+    <MoqVersion>4.8.1</MoqVersion>
+    <NewtonsoftVersion>10.0.3</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.5.0</TestSdkVersion>
+    <XunitVersion>2.3.1</XunitVersion>
+    <FluentAssertionsVersion>5.0.0</FluentAssertionsVersion>
+    <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
     <ProtobufNetVersion>2.1.0</ProtobufNetVersion>
   </PropertyGroup>

diff --git a/sandbox/MetricsPrometheusSandbox/MetricsPrometheusSandbox.csproj b/sandbox/MetricsPrometheusSandbox/MetricsPrometheusSandbox.csproj
@@ -14,9 +14,9 @@
 
 	<ItemGroup>
 	  <PackageReference Include="App.Metrics" Version="$(AppMetricsCoreVersion)" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-	  <PackageReference Include="Serilog.Sinks.Seq" Version="3.3.3" />
+	  <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/sandbox/MetricsPrometheusSandboxMvc/MetricsPrometheusSandboxMvc.csproj b/sandbox/MetricsPrometheusSandboxMvc/MetricsPrometheusSandboxMvc.csproj
@@ -10,11 +10,11 @@
   <ItemGroup>
     <PackageReference Include="App.Metrics.AspNetCore.Mvc" Version="$(AppMetricsAspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreMvcVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="3.3.3" />
-    <PackageReference Include="Serilog.AspNetCore " Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="$(AspNetCoreVersion)" />
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sandbox/MetricsPrometheusSandboxMvc/Startup.cs b/sandbox/MetricsPrometheusSandboxMvc/Startup.cs
@@ -29,7 +29,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddTestStuff();
 
-            services.AddMvc(options => options.AddMetricsResourceFilter());
+            services.AddMvc().AddMetrics();
         }
     }
 }
diff --git a/src/App.Metrics.Formatters.Prometheus/MetricsPrometheusTextOutputFormatter.cs b/src/App.Metrics.Formatters.Prometheus/MetricsPrometheusTextOutputFormatter.cs
@@ -26,7 +26,7 @@ public MetricsPrometheusTextOutputFormatter()
         public MetricsMediaTypeValue MediaType => new MetricsMediaTypeValue("text", "vnd.appmetrics.metrics.prometheus", "v1", "plain");
 
         /// <inheritdoc/>
-        public Task WriteAsync(
+        public async Task WriteAsync(
             Stream output,
             MetricsDataValueSource metricsData,
             CancellationToken cancellationToken = default(CancellationToken))
@@ -38,7 +38,7 @@ public Task WriteAsync(
 
             using (var streamWriter = new StreamWriter(output))
             {
-                return streamWriter.WriteAsync(AsciiFormatter.Format(metricsData.GetPrometheusMetricsSnapshot(_options.MetricNameFormatter), _options.NewLineFormat));
+                await streamWriter.WriteAsync(AsciiFormatter.Format(metricsData.GetPrometheusMetricsSnapshot(_options.MetricNameFormatter), _options.NewLineFormat));
             }
         }
     }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.4.0" PrivateAssets="All" /> 
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" /> 
   </ItemGroup>
 </Project>