Skip to content

Commit 4d5d527

Browse files
authored
Merge pull request #206 from prom-client-net/ci/setup-dotnet
ci: setup dotnet
2 parents 10b7055 + aa4cbf9 commit 4d5d527

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ jobs:
1818
steps:
1919
- name: 🚚 Checkout
2020
uses: actions/checkout@v3
21-
- name: 🛠 Setup .NET Core
21+
- name: 🛠 Setup .NET
2222
uses: actions/setup-dotnet@v2
23+
with:
24+
dotnet-version: |
25+
3.1.x
26+
6.0.x
27+
2328
- name: ⚙ Restore
2429
run: dotnet restore
2530
- name: 🏭 Build

Prometheus.Client.sln

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ ProjectSection(SolutionItems) = preProject
3636
EndProjectSection
3737
EndProject
3838
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{C9643321-CB54-4E2E-B02D-6A6538F3B45F}"
39-
ProjectSection(SolutionItems) = preProject
40-
.github\workflows\pr.yml = .github\workflows\pr.yml
41-
.github\workflows\master.yml = .github\workflows\master.yml
42-
.github\workflows\prod.yml = .github\workflows\prod.yml
43-
EndProjectSection
39+
ProjectSection(SolutionItems) = preProject
40+
.github\workflows\ci.yml = .github\workflows\ci.yml
41+
EndProjectSection
4442
EndProject
4543
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.Abstractions", "src\Prometheus.Client.Abstractions\Prometheus.Client.Abstractions.csproj", "{9A9877F3-719E-4237-BE84-6008E214B7FD}"
4644
EndProject

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![NuGet](https://img.shields.io/nuget/v/Prometheus.Client.svg)](https://www.nuget.org/packages/Prometheus.Client)
44
[![NuGet](https://img.shields.io/nuget/dt/Prometheus.Client.svg)](https://www.nuget.org/packages/Prometheus.Client)
55
[![CodeFactor](https://www.codefactor.io/repository/github/prom-client-net/prom-client/badge)](https://www.codefactor.io/repository/github/prom-client-net/prom-client)
6-
[![CI](https://img.shields.io/github/workflow/status/prom-client-net/prom-client/%F0%9F%92%BF%20CI%20Master?label=CI&logo=github)](https://github.com/prom-client-net/prom-client/actions/workflows/master.yml)
6+
[![CI](https://img.shields.io/github/workflow/status/prom-client-net/prom-client/%F0%9F%92%BF%20CI?label=CI&logo=github)](https://github.com/prom-client-net/prom-client/actions/workflows/ci.yml)
77
[![codecov](https://codecov.io/gh/prom-client-net/prom-client/branch/master/graph/badge.svg)](https://codecov.io/gh/prom-client-net/prom-client)
88
[![License MIT](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
99

tests/Prometheus.Client.Tests/Prometheus.Client.Tests.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>netcoreapp3.1;net6.0</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>../../Prometheus.Client.snk</AssemblyOriginatorKeyFile>

0 commit comments

Comments
 (0)