Skip to content

Commit e978415

Browse files
authored
Merge pull request #54 from prom-client-net/feat/single-target
feat: single target framework
2 parents 22d17d3 + df95a29 commit e978415

File tree

2 files changed

+11
-44
lines changed

2 files changed

+11
-44
lines changed
Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
4-
<VersionPrefix>0.2.0</VersionPrefix>
3+
<TargetFramework>net6.0</TargetFramework>
54
<Description>Prometheus.Client.MetricPusher as HostedService</Description>
65
<RepositoryUrl>https://github.com/prom-client-net/prom-client-metricpusher-hostedservice</RepositoryUrl>
76
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
87
</PropertyGroup>
9-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
10-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.32 " />
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
12-
</ItemGroup>
13-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
14-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
16-
</ItemGroup>
17-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
18-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
20-
</ItemGroup>
218
<ItemGroup>
229
<PackageReference Include="Prometheus.Client.MetricPusher" Version="3.1.0" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
2312
</ItemGroup>
2413
</Project>
Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
54
<InvariantGlobalization>true</InvariantGlobalization>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
8-
97
<ItemGroup>
10-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
148
<PackageReference Include="FluentAssertions" Version="6.12.0" />
159
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1610
<PackageReference Include="NSubstitute" Version="5.1.0" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
1712
<PackageReference Include="xunit" Version="2.8.0" />
18-
<PackageReference Include="coverlet.collector" Version="6.0.2">
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
2014
<PrivateAssets>all</PrivateAssets>
21-
</PackageReference>
22-
</ItemGroup>
23-
24-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.*">
2615
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
<PrivateAssets>all</PrivateAssets>
2816
</PackageReference>
29-
</ItemGroup>
30-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">
31-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
17+
<PackageReference Include="coverlet.collector" Version="6.0.2">
18+
<PrivateAssets>all</PrivateAssets>
3219
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
21+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
3322
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3424
</PackageReference>
3525
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
38-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
39-
</ItemGroup>
40-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
42-
</ItemGroup>
43-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
44-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
45-
</ItemGroup>
46-
4726
<ItemGroup>
4827
<ProjectReference Include="..\src\Prometheus.Client.MetricPusher.HostedService.csproj" />
4928
</ItemGroup>
50-
5129
</Project>

0 commit comments

Comments
 (0)