Skip to content

Commit 9f7d8cb

Browse files
authored
Merge pull request #389 from prom-client-net/update-tfm
Update target framework to net8.0
2 parents 04bc3c9 + a79ec5d commit 9f7d8cb

5 files changed

Lines changed: 22 additions & 13 deletions

File tree

src/Prometheus.Client.Abstractions/Prometheus.Client.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<RootNamespace>Prometheus.Client</RootNamespace>
4-
<TargetFrameworks>net462;net47;netstandard2.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net47;netstandard2.0;net8.0</TargetFrameworks>
55
<Description>Abstractions for Prometheus.Client</Description>
66
<RepositoryUrl>https://github.com/prom-client-net/prom-client</RepositoryUrl>
77
</PropertyGroup>

src/Prometheus.Client/Prometheus.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net462;net47;netstandard2.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net462;net47;netstandard2.0;net8.0</TargetFrameworks>
44
<Description>.NET client for Prometheus</Description>
55
<RepositoryUrl>https://github.com/prom-client-net/prom-client</RepositoryUrl>
66
</PropertyGroup>

tests/Prometheus.Client.Benchmarks.Comparison/Prometheus.Client.Benchmarks.Comparison.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<OutputType>Exe</OutputType>
66
<NoWarn>$(NoWarn);SA1133</NoWarn>

tests/Prometheus.Client.Benchmarks/Prometheus.Client.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<NoWarn>$(NoWarn);SA1133</NoWarn>
66
<OutputType>Exe</OutputType>

tests/Prometheus.Client.Tests/Prometheus.Client.Tests.csproj

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,36 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0;net8.0</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net47;net481;net6.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net462;net472;net481;net8.0;net10.0</TargetFrameworks>
5+
<OutputType Condition="'$(OS)' != 'Unix' AND '$(TargetFramework)' != 'net462'">Exe</OutputType>
56
<IsPackable>false</IsPackable>
6-
<InvariantGlobalization>true</InvariantGlobalization>
77
<NoWarn>$(NoWarn);CS0618</NoWarn>
88
</PropertyGroup>
99
<ItemGroup>
1010
<EmbeddedResource Include="**\Resources\*.txt" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1414
<PackageReference Include="NSubstitute" Version="5.3.0" />
15-
<PackageReference Include="xunit" Version="2.9.3" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
15+
<PackageReference Include="coverlet.collector" Version="8.0.0">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
1720
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1922
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="6.0.4">
23+
</ItemGroup>
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
25+
<PackageReference Include="xunit" Version="2.9.3" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
2127
<PrivateAssets>all</PrivateAssets>
2228
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2329
</PackageReference>
24-
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
30+
</ItemGroup>
31+
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
32+
<PackageReference Include="xunit.v3" Version="3.2.2" />
33+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2534
<PrivateAssets>all</PrivateAssets>
2635
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2736
</PackageReference>

0 commit comments

Comments
 (0)