Skip to content

Commit 263b7f2

Browse files
committed
update build
1 parent 398ece7 commit 263b7f2

File tree

7 files changed

+57
-41
lines changed

7 files changed

+57
-41
lines changed

.editorconfig

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
[*]
2-
charset=utf-8
3-
end_of_line=lf
4-
indent_style=space
5-
max_line_length = 160
2+
charset = utf-8
3+
end_of_line = lf
4+
indent_style = space
5+
max_line_length = 180
6+
insert_final_newline = true
67

7-
[*.{cs}]
8+
[*.cs]
89
indent_size = 4
910
insert_final_newline = true
1011

11-
# Code files
12-
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
13-
indent_style=space
14-
indent_size=2
12+
[*.csproj]
13+
indent_size = 2
1514

16-
# Xml config files
17-
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
15+
[{*.yml,*.yaml}]
1816
indent_size = 2
1917

20-
# JSON files
2118
[*.json]
2219
indent_size = 2
2320

24-
# .NET code style settings:
25-
[*.{cs,vb}]
26-
# Sort using and Import directives with System.* appearing first
21+
[{*.sh, *.ps1}]
22+
indent_size = 2
23+
24+
# code style settings:
25+
[*.{cs}]
2726
dotnet_sort_system_directives_first = true

.gitattributes

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,3 @@
55
*.cs diff=csharp
66
*.sln merge=union
77
*.csproj merge=union
8-
*.vbproj merge=union
9-
*.fsproj merge=union
10-
*.dbproj merge=union
11-
12-
# Standard to msysgit
13-
*.doc diff=astextplain
14-
*.DOC diff=astextplain
15-
*.docx diff=astextplain
16-
*.DOCX diff=astextplain
17-
*.dot diff=astextplain
18-
*.DOT diff=astextplain
19-
*.pdf diff=astextplain
20-
*.PDF diff=astextplain
21-
*.rtf diff=astextplain
22-
*.RTF diff=astextplain

Prometheus.Client.AspNetCore.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ProjectSection(SolutionItems) = preProject
1515
LICENSE = LICENSE
1616
README.md = README.md
1717
.editorconfig = .editorconfig
18+
pack.ps1 = pack.ps1
1819
EndProjectSection
1920
EndProject
2021
Global

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Prometheus.Client.AspNetCore
22

3-
[![NuGet Badge](https://buildstats.info/nuget/Prometheus.Client.AspNetCore)](https://www.nuget.org/packages/Prometheus.Client.AspNetCore/)
3+
[![MyGet](https://img.shields.io/myget/phnx47-beta/vpre/Prometheus.Client.AspNetCore.svg)](https://www.myget.org/feed/phnx47-beta/package/nuget/Prometheus.Client.AspNetCore)
4+
[![NuGet](https://img.shields.io/nuget/v/Prometheus.Client.AspNetCore.svg)](https://www.nuget.org/packages/Prometheus.Client.AspNetCore)
5+
[![NuGet](https://img.shields.io/nuget/dt/Prometheus.Client.AspNetCore.svg)](https://www.nuget.org/packages/Prometheus.Client.AspNetCore)
6+
47
[![Build status](https://ci.appveyor.com/api/projects/status/d5pdqedoxogmiun4/branch/master?svg=true)](https://ci.appveyor.com/project/PrometheusClientNet/prometheus-client-aspnetcore/branch/master)
5-
[![License MIT](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
68
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/73abdf76e71f42dfb6887a15eafb250a)](https://www.codacy.com/app/phnx47/Prometheus.Client.AspNetCore?utm_source=github.com&utm_medium=referral&utm_content=PrometheusClientNet/Prometheus.Client.AspNetCore&utm_campaign=Badge_Grade)
9+
[![License MIT](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
10+
711

812

913
Extension for [Prometheus.Client](https://github.com/PrometheusClientNet/Prometheus.Client)

appveyor.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
11
version: '{build}-{branch}'
22
image: Visual Studio 2017
3+
4+
skip_commits:
5+
files:
6+
- '**/*.md'
7+
38
build_script:
4-
- cmd: dotnet restore src\Prometheus.Client.AspNetCore && dotnet pack src\Prometheus.Client.AspNetCore -c Release --include-symbols
9+
- pwsh: dotnet build -c Release
10+
11+
after_build:
12+
- pwsh: .\pack.ps1
13+
514
artifacts:
6-
- path: '**\*.nupkg'
7-
name: All Nupkg
15+
- path: '**\artifacts\nuget\*.nupkg'
16+
name: Nuget
17+
- path: '**\artifacts\myget\*.nupkg'
18+
name: Myget
19+
820
deploy:
921
- provider: NuGet
1022
api_key:
1123
secure: nts+1V9NzzFZbyAVeJs951l/7K01aEfLTEGGyb8t2zNMcZhBnlSTGPoQV8IRpsMa
24+
artifact: NuGet
1225
on:
13-
appveyor_repo_tag: true
26+
appveyor_repo_tag: true
27+
- provider: NuGet
28+
server: https://www.myget.org/F/phnx47-beta/api/v2/package
29+
api_key:
30+
secure: Smuwoi47XyX6b6x66VpPnnL96F3cl1nukALrFnZo1Oony38dzouByG7pnt6DX4HT
31+
symbol_server: https://www.myget.org/F/phnx47-beta/symbols/api/v2/package
32+
artifact: MyGet
33+
on:
34+
branch: master
35+
appveyor_repo_tag: false

pack.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
if ($env:APPVEYOR_REPO_TAG -eq "false") {
2+
dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.AspNetCore -c Release --include-symbols --no-build --version-suffix build$env:APPVEYOR_BUILD_NUMBER -o artifacts\myget
3+
}
4+
5+
if ($env:APPVEYOR_REPO_TAG -eq "true") {
6+
dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.AspNetCore -c Release --include-symbols --no-build -o artifacts\nuget
7+
}

src/Prometheus.Client.AspNetCore/Prometheus.Client.AspNetCore.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Description>Middleware for the Prometheus.Client</Description>
44
<Copyright>2018 © Sergey Kuznetsov</Copyright>
55
<AssemblyTitle>Prometheus.Client.AspNetCore</AssemblyTitle>
6-
<VersionPrefix>1.6.0</VersionPrefix>
6+
<VersionPrefix>2.0.0</VersionPrefix>
77
<Authors>Sergey Kuznetsov</Authors>
88
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
99
<AssemblyName>Prometheus.Client.AspNetCore</AssemblyName>
@@ -18,9 +18,7 @@
1818
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<!-- for debug -->
22-
<!--<PackageReference Include="Prometheus.Client" Version="1.6.0" />-->
23-
<PackageReference Include="Prometheus.Client" Version="1.6.0-build45" />
21+
<PackageReference Include="Prometheus.Client" Version="2.0.0" />
2422
</ItemGroup>
2523
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
2624
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
@@ -32,4 +30,4 @@
3230
<Version>2.0.0</Version>
3331
</PackageReference>
3432
</ItemGroup>
35-
</Project>
33+
</Project>

0 commit comments

Comments
 (0)