Skip to content

Commit 795dc7b

Browse files
committed
Merge branch 'master' into develop
2 parents be60128 + 4bd363a commit 795dc7b

File tree

3 files changed

+39
-5
lines changed

3 files changed

+39
-5
lines changed

.editorconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#top-most EditorConfig for project
2+
root = true
3+
4+
[*]
5+
end_of_line = crlf
6+
insert_final_newline = true
7+
8+
[*.cs]
9+
indent_style = space
10+
indent_size = 4
11+
12+
[*.{xml,csproj,config}]
13+
indent_style = tab
14+
indent_size = 4
15+
16+
[*.json]
17+
indent_style = space
18+
indent_size = 2
19+
20+
[*.js]
21+
indent_style = space
22+
indent_size = 2
23+
24+
[*.yml]
25+
indent_style = space
26+
indent_size = 2

appveyor.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#version should be only changed with RELEASE eminent, see RELEASE.md
2-
version: 2.3.{build}
2+
version: 2.4.{build}
33

44
clone_depth: 1
55
pull_requests:
@@ -31,18 +31,26 @@ after_test:
3131

3232
artifacts:
3333
- path: 'src/CommandLine/bin/Release/*.nupkg'
34-
name: NugetPackages
34+
name: NuGetPackages
3535

3636
on_failure:
3737
- cmd: |
3838
tree /f /a >files.lst
3939
appveyor PushArtifact .\files.lst -DeploymentName "Failed Build File Listing"
4040
4141
deploy:
42+
- provider: GitHub
43+
auth_token:
44+
secure: hVyVwHl0JiVq0VxXB4VMRWbUtrGclIzadfnWFcWCQBLvbgMLahLBnWlwGglT63pZ
45+
artifact: 'NuGetPackages'
46+
prerelease: false
47+
force_update: true #fsharp package runs as separate build job, so have to force_update to add fsharp.nuget added
48+
on:
49+
APPVEYOR_REPO_TAG: true
50+
4251
- provider: NuGet
4352
api_key:
44-
secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG
53+
secure: Ab4T/48EyIJhVrqkfKdUxmHUtseEVuXuyrGACxZ0KN35rb/BzABlBM2YjZojicvT
4554
artifact: 'NuGetPackages'
4655
on:
4756
APPVEYOR_REPO_TAG: true
48-

src/CommandLine/CommandLine.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Authors>gsscoder;nemec;ericnewton76</Authors>
1515
<Title>Command Line Parser Library</Title>
1616
<Version Condition="'$(VersionSuffix)' != ''">$(VersionSuffix)</Version>
17-
<Version Condition="'$(VersionSuffix)' == ''">2.3.0</Version>
17+
<Version Condition="'$(VersionSuffix)' == ''">2.4.0</Version>
1818
<Description Condition="'$(BuildTarget)' != 'fsharp'">Terse syntax C# command line parser for .NET. For FSharp support see CommandLineParser.FSharp. The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks.</Description>
1919
<Description Condition="'$(BuildTarget)' == 'fsharp'">Terse syntax C# command line parser for .NET with F# support. The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks.</Description>
2020
<Copyright>Copyright (c) 2005 - 2018 Giacomo Stelluti Scala &amp; Contributors</Copyright>

0 commit comments

Comments
 (0)