Skip to content

Commit 0f55cdb

Browse files
phnx47phnx47
authored
Merge pull request #17 from PrometheusClientNet/v4-prepare
V4 prepare
2 parents 2e51b94 + 149fd3a commit 0f55cdb

File tree

18 files changed

+497
-184
lines changed

18 files changed

+497
-184
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @phnx47 @sanych-sun

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ko_fi: phnx47
2+
patreon: phnx47
3+
custom: ['https://www.buymeacoffee.com/phnx47']

‎.github/renovate.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"separateMajorMinor": true,
3+
"labels": [
4+
"dependencies"
5+
],
6+
"assignees": [
7+
"@phnx47"
8+
],
9+
"extends": [
10+
"config:base"
11+
],
12+
"nuget": {
13+
"enabled": true
14+
}
15+
}

‎.github/workflows/branch.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- '*'
7+
- '!master'
8+
tags:
9+
- '!refs/tags/*'
10+
pull_request:
11+
branches:
12+
- master
13+
14+
jobs:
15+
build-branch:
16+
runs-on: ubuntu-20.04
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v1
20+
- name: Setup .NET Core
21+
uses: actions/setup-dotnet@v1
22+
- name: Restore
23+
run: dotnet restore
24+
- name: Build
25+
run: dotnet build --no-restore -c Release
26+
- name: Tests
27+
run: dotnet test --no-build -c Release

‎.github/workflows/master.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
tags:
8+
- '!refs/tags/*'
9+
10+
jobs:
11+
build-publish-dev:
12+
runs-on: ubuntu-20.04
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v1
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
source-url: https://nuget.pkg.github.com/prometheusclientnet/index.json
20+
env:
21+
NUGET_AUTH_TOKEN: ${{secrets.GH_DEPLOY_KEY}}
22+
- name: Restore
23+
run: dotnet restore
24+
- name: Build
25+
run: dotnet build --no-restore -c Release
26+
- name: Tests
27+
run: dotnet test --no-build -c Release
28+
- name: Pack artifacts
29+
run: dotnet pack src/* --no-build -c Release --version-suffix dev-$(date +%s) -o artifacts/
30+
- name: Publish artifacts
31+
uses: actions/upload-artifact@v2
32+
with:
33+
name: nupkg
34+
path: artifacts/*
35+
- name: Publish to GitHub
36+
run: dotnet nuget push "artifacts/*.nupkg" --skip-duplicate --no-symbols true

‎.github/workflows/production.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: "CI"
2+
3+
on:
4+
push:
5+
tags:
6+
- '[34].[0-9]+.[0-9]+'
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-20.04
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v1
14+
- name: Setup .NET Core
15+
uses: actions/setup-dotnet@v1
16+
- name: Restore
17+
run: dotnet restore
18+
- name: Build
19+
run: dotnet build -c Release
20+
- name: Tests
21+
run: dotnet test -c Release --no-build
22+
- name: Pack artifacts
23+
run: dotnet pack src/* -c Release --no-build -o artifacts/
24+
- name: Publish artifacts
25+
uses: actions/upload-artifact@v2
26+
with:
27+
name: nupkg
28+
path: artifacts/*
29+
- name: Publish to NuGet
30+
run: dotnet nuget push "artifacts/*.nupkg" --api-key ${{ secrets.NUGET_DEPLOY_KEY }} --source https://api.nuget.org/v3/index.json

‎.ruleset‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RuleSet Name=".ruleset" Description=" " ToolsVersion="15.0">
3+
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
4+
<Rule Id="SA1311" Action="None" />
5+
<Rule Id="SA1309" Action="None" />
6+
<Rule Id="SA1303" Action="None" />
7+
<Rule Id="SA1304" Action="None" />
8+
<Rule Id="SA1307" Action="None" />
9+
<Rule Id="SA1308" Action="None" />
10+
<Rule Id="SA1310" Action="None" />
11+
<Rule Id="SA1300" Action="None" />
12+
<Rule Id="SA1301" Action="None" />
13+
<Rule Id="SA1302" Action="None" />
14+
<Rule Id="SA1305" Action="None" />
15+
<Rule Id="SA1306" Action="None" />
16+
<Rule Id="SA1600" Action="None" />
17+
<Rule Id="SA1601" Action="None" />
18+
<Rule Id="SA1602" Action="None" />
19+
<Rule Id="SA1603" Action="None" />
20+
<Rule Id="SA1604" Action="None" />
21+
<Rule Id="SA1605" Action="None" />
22+
<Rule Id="SA1606" Action="None" />
23+
<Rule Id="SA1607" Action="None" />
24+
<Rule Id="SA1608" Action="None" />
25+
<Rule Id="SA1611" Action="None" />
26+
<Rule Id="SA1612" Action="None" />
27+
<Rule Id="SA1613" Action="None" />
28+
<Rule Id="SA1614" Action="None" />
29+
<Rule Id="SA1615" Action="None" />
30+
<Rule Id="SA1616" Action="None" />
31+
<Rule Id="SA1617" Action="None" />
32+
<Rule Id="SA1618" Action="None" />
33+
<Rule Id="SA1619" Action="None" />
34+
<Rule Id="SA1620" Action="None" />
35+
<Rule Id="SA1621" Action="None" />
36+
<Rule Id="SA1622" Action="None" />
37+
<Rule Id="SA1623" Action="None" />
38+
<Rule Id="SA1624" Action="None" />
39+
<Rule Id="SA1625" Action="None" />
40+
<Rule Id="SA1626" Action="None" />
41+
<Rule Id="SA1627" Action="None" />
42+
<Rule Id="SA1630" Action="None" />
43+
<Rule Id="SA1631" Action="None" />
44+
<Rule Id="SA1642" Action="None" />
45+
<Rule Id="SA1643" Action="None" />
46+
<Rule Id="SA1644" Action="None" />
47+
<Rule Id="SA1646" Action="None" />
48+
<Rule Id="SA1647" Action="None" />
49+
<Rule Id="SA1648" Action="None" />
50+
<Rule Id="SA1650" Action="None" />
51+
<Rule Id="SA1633" Action="None" />
52+
<Rule Id="SA1634" Action="None" />
53+
<Rule Id="SA1635" Action="None" />
54+
<Rule Id="SA1637" Action="None" />
55+
<Rule Id="SA1638" Action="None" />
56+
<Rule Id="SA1640" Action="None" />
57+
<Rule Id="SA1649" Action="None" />
58+
<Rule Id="SA1503" Action="None" />
59+
<Rule Id="SA1516" Action="None" />
60+
<Rule Id="SA1500" Action="None" />
61+
<Rule Id="SA1515" Action="None" />
62+
<Rule Id="SA1514" Action="None" />
63+
<Rule Id="SA1501" Action="None" />
64+
<Rule Id="SA1502" Action="None" />
65+
<Rule Id="SA1512" Action="None" />
66+
<Rule Id="SA1413" Action="None" />
67+
<Rule Id="SA1200" Action="None" />
68+
<Rule Id="SA1201" Action="None" />
69+
<Rule Id="SA1202" Action="None" />
70+
<Rule Id="SA1204" Action="None" />
71+
<Rule Id="SA1214" Action="None" />
72+
<Rule Id="SA1215" Action="None" />
73+
<Rule Id="SA1210" Action="None" />
74+
<Rule Id="SA1211" Action="None" />
75+
<Rule Id="SA1203" Action="None" />
76+
<Rule Id="SA1208" Action="None" />
77+
<Rule Id="SA1206" Action="None" />
78+
<Rule Id="SA1207" Action="None" />
79+
<Rule Id="SA1205" Action="None" />
80+
<Rule Id="SA1212" Action="None" />
81+
<Rule Id="SA1213" Action="None" />
82+
<Rule Id="SA1209" Action="None" />
83+
<Rule Id="SA1100" Action="None" />
84+
<Rule Id="SA1101" Action="None" />
85+
<Rule Id="SA1126" Action="None" />
86+
<Rule Id="SA1116" Action="None" />
87+
<Rule Id="SA1117" Action="None" />
88+
<Rule Id="SA1104" Action="None" />
89+
<Rule Id="SA1105" Action="None" />
90+
<Rule Id="SA1122" Action="None" />
91+
<Rule Id="SA1115" Action="None" />
92+
<Rule Id="SA1121" Action="None" />
93+
<Rule Id="SA1110" Action="None" />
94+
<Rule Id="SA1111" Action="None" />
95+
<Rule Id="SA1120" Action="None" />
96+
<Rule Id="SA1114" Action="None" />
97+
<Rule Id="SA1123" Action="None" />
98+
<Rule Id="SA1109" Action="None" />
99+
<Rule Id="SA1125" Action="None" />
100+
<Rule Id="SA1108" Action="None" />
101+
<Rule Id="SA1113" Action="None" />
102+
<Rule Id="SA1112" Action="None" />
103+
<Rule Id="SA1004" Action="None" />
104+
<Rule Id="SA1005" Action="None" />
105+
<Rule Id="SA1028" Action="Info" />
106+
<Rule Id="SA1027" Action="None" />
107+
<Rule Id="SA1008" Action="None" />
108+
<Rule Id="SA1009" Action="None" />
109+
<Rule Id="SA1025" Action="None" />
110+
<Rule Id="SA1000" Action="None" />
111+
<Rule Id="SA1001" Action="None" />
112+
<Rule Id="SA1003" Action="None" />
113+
<Rule Id="SA1006" Action="None" />
114+
<Rule Id="SA1007" Action="None" />
115+
<Rule Id="SA1010" Action="None" />
116+
<Rule Id="SA1011" Action="None" />
117+
<Rule Id="SA1012" Action="None" />
118+
<Rule Id="SA1013" Action="None" />
119+
<Rule Id="SA1014" Action="None" />
120+
<Rule Id="SA1015" Action="None" />
121+
<Rule Id="SA1016" Action="None" />
122+
<Rule Id="SA1017" Action="None" />
123+
<Rule Id="SA1018" Action="None" />
124+
<Rule Id="SA1019" Action="None" />
125+
<Rule Id="SA1020" Action="None" />
126+
<Rule Id="SA1021" Action="None" />
127+
<Rule Id="SA1022" Action="None" />
128+
<Rule Id="SA1024" Action="None" />
129+
<Rule Id="SA1026" Action="None" />
130+
<Rule Id="SA1400" Action="None" />
131+
<Rule Id="SA1401" Action="None" />
132+
<Rule Id="SA1119" Action="None" />
133+
<Rule Id="SA1410" Action="None" />
134+
<Rule Id="SA1411" Action="None" />
135+
<Rule Id="SA1404" Action="None" />
136+
<Rule Id="SA1405" Action="None" />
137+
<Rule Id="SA1406" Action="None" />
138+
<Rule Id="SA0001" Action="None" />
139+
<Rule Id="SX1101" Action="Error" />
140+
<Rule Id="SX1309" Action="Error" />
141+
<Rule Id="SX1309S" Action="Error" />
142+
<Rule Id="SA1402" Action="None" />
143+
<Rule Id="SA1629" Action="Hidden" />
144+
</Rules>
145+
</RuleSet>

‎Directory.Build.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>latest</LangVersion>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
7+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
8+
<PrivateAssets>all</PrivateAssets>
9+
</PackageReference>
10+
</ItemGroup>
11+
<ItemGroup>
12+
<AdditionalFiles Include="$(SolutionDir)stylecop.json">
13+
<Link>Properties\stylecop.json</Link>
14+
</AdditionalFiles>
15+
</ItemGroup>
16+
<PropertyGroup>
17+
<CodeAnalysisRuleSet>$(SolutionDir)\.ruleset</CodeAnalysisRuleSet>
18+
</PropertyGroup>
19+
</Project>

‎Prometheus.Client.MetricServer.sln‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prometheus.Client.MetricSer
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{465CE32E-016E-46A1-9636-3411CB742385}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prometheus.Client.MetricServer.NetCore.Tests", "tests\Prometheus.Client.MetricServer.NetCore.Tests\Prometheus.Client.MetricServer.NetCore.Tests.csproj", "{7DC9CABA-8C8B-4ADD-BF3F-D67BB580027A}"
13-
EndProject
1412
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7ADF00AE-7F6D-4C7E-B0F0-B2A19627DDF8}"
1513
ProjectSection(SolutionItems) = preProject
1614
.editorconfig = .editorconfig
1715
.gitattributes = .gitattributes
1816
.gitignore = .gitignore
19-
appveyor.yml = appveyor.yml
2017
LICENSE = LICENSE
21-
pack.sh = pack.sh
22-
Prometheus.Client.MetricServer.snk = Prometheus.Client.MetricServer.snk
2318
README.md = README.md
19+
Directory.Build.props = Directory.Build.props
20+
.ruleset = .ruleset
21+
stylecop.json = stylecop.json
2422
EndProjectSection
2523
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.MetricServer.Tests", "tests\Prometheus.Client.MetricServer.Tests\Prometheus.Client.MetricServer.Tests.csproj", "{21EE82C6-BFDD-4DDD-A49F-2543F44B4E70}"
25+
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2828
Debug|Any CPU = Debug|Any CPU
@@ -33,17 +33,17 @@ Global
3333
{C77F577A-8639-4A63-966D-80C174B3D999}.Debug|Any CPU.Build.0 = Debug|Any CPU
3434
{C77F577A-8639-4A63-966D-80C174B3D999}.Release|Any CPU.ActiveCfg = Release|Any CPU
3535
{C77F577A-8639-4A63-966D-80C174B3D999}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{7DC9CABA-8C8B-4ADD-BF3F-D67BB580027A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{7DC9CABA-8C8B-4ADD-BF3F-D67BB580027A}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{7DC9CABA-8C8B-4ADD-BF3F-D67BB580027A}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{7DC9CABA-8C8B-4ADD-BF3F-D67BB580027A}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{21EE82C6-BFDD-4DDD-A49F-2543F44B4E70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{21EE82C6-BFDD-4DDD-A49F-2543F44B4E70}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{21EE82C6-BFDD-4DDD-A49F-2543F44B4E70}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{21EE82C6-BFDD-4DDD-A49F-2543F44B4E70}.Release|Any CPU.Build.0 = Release|Any CPU
4040
EndGlobalSection
4141
GlobalSection(SolutionProperties) = preSolution
4242
HideSolutionNode = FALSE
4343
EndGlobalSection
4444
GlobalSection(NestedProjects) = preSolution
4545
{C77F577A-8639-4A63-966D-80C174B3D999} = {8E29CEE6-355D-427A-8EDA-F2A1FE60BC3B}
46-
{7DC9CABA-8C8B-4ADD-BF3F-D67BB580027A} = {465CE32E-016E-46A1-9636-3411CB742385}
46+
{21EE82C6-BFDD-4DDD-A49F-2543F44B4E70} = {465CE32E-016E-46A1-9636-3411CB742385}
4747
EndGlobalSection
4848
GlobalSection(ExtensibilityGlobals) = postSolution
4949
SolutionGuid = {6CA14866-8A1E-4C8C-AE98-A806F33741EF}

‎appveyor.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)