Skip to content
This repository was archived by the owner on Mar 26, 2019. It is now read-only.

Commit 2ef1f42

Browse files
alhardyalhardy
committed
#33 net core 2.1 updates, bumping app metrics version to latest
1 parent 607bcf0 commit 2ef1f42

9 files changed

+30
-24
lines changed

‎appveyor.yml

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ deploy:
3232
secure: gIAiACgNj+JzXyLLTe3rLxZyrAB9RpC8Lw81xEjdOLXqotprqEwGiFWRipEqkpps
3333
skip_symbols: true
3434
symbol_server: https://www.myget.org/F/appmetrics/symbol
35+
install:
36+
- cmd: curl -O https://download.microsoft.com/download/8/8/5/88544F33-836A-49A5-8B67-451C24709A8F/dotnet-sdk-2.1.300-win-x64.exe
37+
- cmd: dotnet-sdk-2.1.300-win-x64.exe /install /quiet /norestart /log install.log
3538
skip_commits:
3639
files:
3740
- '**/*.md'

‎build/dependencies.props

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
<Project>
22
<PropertyGroup>
3-
<AppMetricsCoreVersion>2.1.0-*</AppMetricsCoreVersion>
3+
<AppMetricsCoreVersion>3.0.0-*</AppMetricsCoreVersion>
44
<AppMetricsAspNetCoreVersion>2.1.0-*</AppMetricsAspNetCoreVersion>
55
<AspNetCoreVersion>2.0.1</AspNetCoreVersion>
66
<AspNetCoreMvcVersion>2.0.2</AspNetCoreMvcVersion>
77
<MicrosoftExtensionsVersion>2.0.0</MicrosoftExtensionsVersion>
88
<AppMetricsReportingVersion>2.0.0-*</AppMetricsReportingVersion>
9-
<BenchmarkDotNetVersion>0.10.12</BenchmarkDotNetVersion>
10-
<CoreFxVersion>4.4.0</CoreFxVersion>
11-
<DependencyModelVersion>2.0.4</DependencyModelVersion>
12-
<MoqVersion>4.8.1</MoqVersion>
13-
<NewtonsoftVersion>10.0.3</NewtonsoftVersion>
14-
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
15-
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
16-
<TestSdkVersion>15.5.0</TestSdkVersion>
17-
<XunitVersion>2.3.1</XunitVersion>
18-
<FluentAssertionsVersion>5.0.0</FluentAssertionsVersion>
9+
<CoreFxVersion>4.5.0</CoreFxVersion>
10+
<DependencyModelVersion>2.1.0</DependencyModelVersion>
11+
<MoqVersion>4.8.2</MoqVersion>
12+
<NewtonsoftVersion>11.0.2</NewtonsoftVersion>
13+
<TestSdkVersion>15.8.0-preview-20180510-03</TestSdkVersion>
14+
<XunitVersion>2.4.0-beta.2.build4010</XunitVersion>
15+
<FluentAssertionsVersion>5.3.2</FluentAssertionsVersion>
1916
<FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
2017
<StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
2118
<ProtobufNetVersion>2.1.0</ProtobufNetVersion>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test", "sandbox" ],
33
"sdk": {
4-
"version": "2.0.0"
4+
"version": "2.1.300"
55
}
66
}

‎sandbox/MetricsPrometheusSandbox/MetricsPrometheusSandbox.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
8-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
7+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
8+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.1</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<ItemGroup>
@@ -15,8 +15,8 @@
1515
<ItemGroup>
1616
<PackageReference Include="App.Metrics" Version="$(AppMetricsCoreVersion)" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
18-
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
19-
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
18+
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.1-dev-00044" />
19+
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.1-dev-00155" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎sandbox/MetricsPrometheusSandboxMvc/MetricsPrometheusSandboxMvc.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
6+
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.1</TargetFrameworks>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="App.Metrics.AspNetCore.Mvc" Version="$(AppMetricsAspNetCoreVersion)" />
1212
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
1313
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreMvcVersion)" />
1414
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsVersion)" />
15-
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
16-
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
17-
<PackageReference Include="Serilog.AspNetCore " Version="2.1.0" />
15+
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.1-dev-00044" />
16+
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.1-dev-00155" />
17+
<PackageReference Include="Serilog.AspNetCore " Version="2.1.2-dev-00024" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/App.Metrics.Formatters.Prometheus/MetricsPrometheusProtobufOutputFormatter.cs

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ public MetricsPrometheusProtobufOutputFormatter()
2828
/// <inheritdoc/>
2929
public MetricsMediaTypeValue MediaType => new MetricsMediaTypeValue("application", "vnd.appmetrics.metrics.prometheus", "v1", "vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited");
3030

31+
/// <inheritdoc/>
32+
public MetricFields MetricFields { get; set; }
33+
3134
/// <inheritdoc/>
3235
public Task WriteAsync(
3336
Stream output,

‎src/App.Metrics.Formatters.Prometheus/MetricsPrometheusTextOutputFormatter.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@ public MetricsPrometheusTextOutputFormatter()
2525
/// <inheritdoc/>
2626
public MetricsMediaTypeValue MediaType => new MetricsMediaTypeValue("text", "vnd.appmetrics.metrics.prometheus", "v1", "plain");
2727

28+
/// <inheritdoc/>
29+
public MetricFields MetricFields { get; set; }
30+
2831
/// <inheritdoc/>
2932
public async Task WriteAsync(
3033
Stream output,
3134
MetricsDataValueSource metricsData,
32-
CancellationToken cancellationToken = default(CancellationToken))
35+
CancellationToken cancellationToken = default)
3336
{
3437
if (output == null)
3538
{

‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
3+
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" />
44
</ItemGroup>
55
</Project>

‎version.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- This file may be overwritten by automation. -->
22
<Project>
33
<PropertyGroup>
4-
<VersionPrefix>2.1.0</VersionPrefix>
4+
<VersionPrefix>3.0.0</VersionPrefix>
55
<VersionSuffix></VersionSuffix>
66
</PropertyGroup>
77
</Project>

0 commit comments

Comments
 (0)