Skip to content

Commit f84dcb0

Browse files
authored
Merge pull request #56 from prom-client-net/net60
feat: add net6.0 target framework
2 parents 44fcc63 + 2375854 commit f84dcb0

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

Prometheus.Client.DependencyInjection.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ EndProjectSection
2323
EndProject
2424
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9180D57F-B3A8-4005-B756-41E0AEBE87C7}"
2525
ProjectSection(SolutionItems) = preProject
26-
.github\workflows\branch.yml = .github\workflows\branch.yml
26+
.github\workflows\pr.yml = .github\workflows\pr.yml
2727
.github\workflows\master.yml = .github\workflows\master.yml
28-
.github\workflows\production.yml = .github\workflows\production.yml
28+
.github\workflows\prod.yml = .github\workflows\prod.yml
2929
EndProjectSection
3030
EndProject
3131
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.DependencyInjection", "src\Prometheus.Client.DependencyInjection.csproj", "{D21BC30A-2F08-4B82-A0B7-C7CED812FF73}"
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
4-
<VersionPrefix>1.0.1</VersionPrefix>
3+
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
4+
<VersionPrefix>1.1.0</VersionPrefix>
55
<Description>Microsoft.Extensions.DependencyInjection (IServiceCollection) support for the Prometheus.Client</Description>
66
<PackageId>Prometheus.Client.DependencyInjection</PackageId>
7-
<PackageTags>prometheus;metrics</PackageTags>
8-
<PackageIcon>icon.png</PackageIcon>
9-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10-
<RepositoryType>git</RepositoryType>
117
<RepositoryUrl>https://github.com/prom-client-net/prom-client-dependencyinjection</RepositoryUrl>
12-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
13-
<IncludeSymbols>true</IncludeSymbols>
14-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15-
<SignAssembly>true</SignAssembly>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
169
<AssemblyOriginatorKeyFile>../Prometheus.Client.DependencyInjection.snk</AssemblyOriginatorKeyFile>
1710
</PropertyGroup>
1811
<ItemGroup>
19-
<None Include="../icon.png">
20-
<Pack>true</Pack>
21-
<Visible>false</Visible>
22-
<PackagePath></PackagePath>
23-
</None>
12+
<None Include="..\icon.png" Visible="false" Pack="true" PackagePath="" />
2413
</ItemGroup>
2514
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
2615
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
2716
</ItemGroup>
2817
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
2918
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
3019
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
22+
</ItemGroup>
3123
<ItemGroup>
32-
<PackageReference Include="Prometheus.Client" Version="[4.5.2,5.0.0)" />
24+
<PackageReference Include="Prometheus.Client" Version="[4.5.3,5.0.0)" />
3325
</ItemGroup>
3426
</Project>

0 commit comments

Comments
 (0)