Skip to content

Commit cc6f18a

Browse files
committed
feat: update target frameworks
1 parent bd6876a commit cc6f18a

File tree

2 files changed

+14
-37
lines changed

2 files changed

+14
-37
lines changed
Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
4-
<VersionPrefix>1.3.1</VersionPrefix>
3+
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
54
<Description>DependencyInjection support for the Prometheus.Client</Description>
65
<RepositoryUrl>https://github.com/prom-client-net/prom-client-dependencyinjection</RepositoryUrl>
76
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
87
</PropertyGroup>
9-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
11-
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
14-
</ItemGroup>
15-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
17-
</ItemGroup>
188
<ItemGroup>
19-
<PackageReference Include="Prometheus.Client" Version="[5.2.0,6.0.0)" />
9+
<PackageReference Include="Prometheus.Client" Version="5.2.0" />
10+
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.32" />
11+
<PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
12+
<PackageReference Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
2013
</ItemGroup>
2114
</Project>

tests/Prometheus.Client.DependencyInjection.Tests.csproj

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<!-- netcoreapp2.1 => netstandard2.0 -->
4-
<!-- netcoreapp3.1 => netstandard2.1 -->
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net6.0;net8.0</TargetFrameworks>
65
<IsPackable>false</IsPackable>
7-
<InvariantGlobalization>true</InvariantGlobalization>
86
<NoWarn>$(NoWarn);CS0618</NoWarn>
97
</PropertyGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.*" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.*" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
14-
</ItemGroup>
15-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
19-
</ItemGroup>
20-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
24-
</ItemGroup>
25-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
29-
</ItemGroup>
308
<ItemGroup>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
10+
<PackageReference Include="xunit" Version="2.8.1" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14+
</PackageReference>
3115
<PackageReference Include="coverlet.collector" Version="6.0.2">
3216
<PrivateAssets>all</PrivateAssets>
3317
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -36,7 +20,7 @@
3620
<PrivateAssets>all</PrivateAssets>
3721
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3822
</PackageReference>
39-
<PackageReference Include="xunit" Version="2.8.1" />
23+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
4024
</ItemGroup>
4125
<ItemGroup>
4226
<ProjectReference Include="..\src\Prometheus.Client.DependencyInjection.csproj" />

0 commit comments

Comments
 (0)