Skip to content

Commit

Permalink
build, .editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
phnx47 committed Sep 14, 2018
1 parent 7ad7fd6 commit 04ba7fd
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 39 deletions.
30 changes: 21 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
[*]
charset=utf-8
end_of_line=lf
trim_trailing_whitespace=false
insert_final_newline=false
indent_style=space
indent_size=4
charset = utf-8
end_of_line = lf
indent_style = space
max_line_length = 180
insert_final_newline = true

[*.cs]
max_line_length = 160
indent_size = 4
insert_final_newline = true

[*.csproj]
indent_size = 2

[{*.yml,*.yaml}]
indent_style=space
indent_size=2
indent_size = 2

[*.json]
indent_size = 2

[{*.sh, *.ps1}]
indent_size = 2

# code style settings:
[*.{cs}]
dotnet_sort_system_directives_first = true
15 changes: 0 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,3 @@
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
8 changes: 1 addition & 7 deletions Prometheus.Client.HttpRequestDurations.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
appveyor.yml = appveyor.yml
.editorconfig = .editorconfig
pack.ps1 = pack.ps1
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prometheus.Client.HttpRequestDurations", "src\Prometheus.Client.HttpRequestDurations\Prometheus.Client.HttpRequestDurations.csproj", "{C0984EB8-6DB2-4FA7-85E3-7BD1417EF31F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{852492CB-7359-4A9F-B769-9CF468B4B9A5}"
ProjectSection(SolutionItems) = preProject
pack.ps1 = pack.ps1
build.ps1 = build.ps1
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -39,7 +34,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{C0984EB8-6DB2-4FA7-85E3-7BD1417EF31F} = {B922FA4B-1584-4EA7-8656-F9034FB45F9D}
{852492CB-7359-4A9F-B769-9CF468B4B9A5} = {285A8931-C09A-482E-9EF3-D90AA616A0FD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {122FC3C2-0B76-492D-98B6-0E610316031E}
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ skip_commits:
- '**/*.md'

build_script:
- ps: .\build.ps1
- pwsh: dotnet build -c Release

after_build:
- ps: .\pack.ps1
- pwsh: .\pack.ps1

artifacts:
- path: '**\artifacts\nuget\*.nupkg'
Expand All @@ -32,4 +32,4 @@ deploy:
artifact: MyGet
on:
branch: master
appveyor_repo_tag: false
appveyor_repo_tag: false
2 changes: 0 additions & 2 deletions build.ps1

This file was deleted.

6 changes: 3 additions & 3 deletions pack.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
if ($env:APPVEYOR_REPO_TAG -eq "false") {
dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build --version-suffix build$env:APPVEYOR_BUILD_NUMBER -o artifacts\myget
dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build --version-suffix build$env:APPVEYOR_BUILD_NUMBER -o artifacts\myget
}

if ($env:APPVEYOR_REPO_TAG -eq "true") {
dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build -o artifacts\nuget
}
dotnet pack $env:APPVEYOR_BUILD_FOLDER\src\Prometheus.Client.HttpRequestDurations -c Release --include-symbols --no-build -o artifacts\nuget
}

0 comments on commit 04ba7fd

Please sign in to comment.