Skip to content

Commit f573e66

Browse files
authored
Merge pull request #203 from ericnewton76/fix/appveyor-updates
Fix/appveyor updates
2 parents fd13848 + aab51fe commit f573e66

File tree

5 files changed

+52
-33
lines changed

5 files changed

+52
-33
lines changed

.gitignore

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,27 @@
1-
src/CommandLine/bin/*
2-
src/CommandLine/obj
3-
src/CommandLine.dotnet/bin/*
4-
src/CommandLine.dotnet/obj
5-
demo/ReadText.Demo/bin/*
6-
demo/ReadText.Demo/obj
7-
/demo/ReadText.Demo.VB/bin/*
8-
/demo/ReadText.Demo.VB/obj
9-
tests/CommandLine.Tests/bin/*
10-
tests/CommandLine.Tests/obj
11-
tests/CommandLine.DotNet.Tests/bin/*
12-
tests/CommandLine.DotNet.Tests/obj
13-
tests/CommandLine.Tests.Properties/bin/*
14-
tests/CommandLine.Tests.Properties/obj
15-
src/templates/CSharpTemplate/bin/*
16-
src/templates/CSharpTemplate/obj
17-
src/templates/VBNetTemplate/bin/*
18-
src/templates/VBNetTemplate/obj
1+
2+
#ignore build outputs
3+
[B|b]in
4+
[O|o]bj
195
build/*
6+
7+
#ignore managed external libs
208
packages
219
paket-files
10+
2211
*.suo
2312
*.userprefs
2413
*~
2514
\#*\#
2615
*.pidb
16+
17+
#ignore Test results/temps
2718
*.test-cache
2819
tests/CommandLine/test-results/*
2920
tests/CommandLine.Tests/test-results/*
21+
TestResult.xml
22+
3023
*.DS_Store
3124
*.csproj.user
32-
TestResult.xml
3325
*.nupkg
3426
*.old
3527
StyleCop.Cache
@@ -43,6 +35,6 @@ artifacts/*
4335
*.lock.json
4436
*.nuget.props
4537
*.DotSettings.user
46-
# Visual Studio 2015 cache/options directory
47-
.vs/
38+
# Visual Studio 2015 cache/options directory
39+
.vs/
4840

CommandLine.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>CommandLineParser</id>
5-
<version>2.1.0-beta2</version>
5+
<version>$version$</version>
66
<title>Command Line Parser Library</title>
77
<authors>Giacomo Stelluti Scala</authors>
88
<description>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>
99
<releaseNotes />
10-
<copyright>Copyright (c) 2005 - 2016 Giacomo Stelluti Scala</copyright>
10+
<copyright>Copyright (c) 2005 - 2017 Giacomo Stelluti Scala &amp; Contributors</copyright>
1111
<licenseUrl>https://github.com/commandlineparser/commandline/blob/master/License.md</licenseUrl>
1212
<projectUrl>https://github.com/commandlineparser/commandline</projectUrl>
1313
<owners>Giacomo Stelluti Scala</owners>

appveyor.yml

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,51 @@
1-
version: 0.0.1.{build}
1+
#version should be changed with any pull requests
2+
version: 2.2.0.{build}
23

34
clone_depth: 1
45
pull_requests:
56
do_not_increment_build_number: true
67

8+
cache:
9+
- packages -> paket.dependencies
10+
711
init:
8-
- git config --global core.autocrlf input
12+
- ps: >
13+
git config --global core.autocrlf input
14+
15+
if ($env:APPVEYOR_REPO_TAG -eq "true")
16+
17+
{
18+
19+
Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
20+
21+
}
22+
23+
else
24+
25+
{
26+
$ver = $env:APPVEYOR_BUILD_VERSION
27+
$commit = $env:APPVEYOR_REPO_COMMIT.substring(0,7)
28+
Update-AppveyorBuild -Version "$ver-$commit"
29+
30+
}
931
1032
build_script:
1133
- cmd: build.cmd
1234

13-
test: off
35+
after_build:
36+
- cmd: nuget pack CommandLine.nuspec -version %APPVEYOR_BUILD_VERSION%
37+
38+
test: off #tests handled within FAKE
1439

1540
artifacts:
16-
- path: build/*.nupkg
41+
- path: '*.nupkg'
1742
name: NugetPackage
1843

1944
deploy:
2045
- provider: NuGet
2146
api_key:
22-
secure: sQzzieUQGkTU0CvzXLcv5Wph6K7h3T+8teovqwa/Dzk1p9WhpmuUHiRxd3U0YhqO
47+
secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG
2348
artifact: 'NuGetPackage'
2449
on:
25-
branch: release
50+
branch: master
51+
APPVEYOR_REPO_TAG: true

src/CommandLine/Infrastructure/EnumerableExtensions`1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public static bool Empty<TSource>(this IEnumerable<TSource> source)
3737
/// <summary>
3838
/// Breaks a collection into groups of a specified size.
3939
/// </summary>
40-
/// <param name="source">A collection of <typeparam name="T"/>.
40+
/// <param name="source">A collection of <typeparam name="T"/>.</param>
4141
/// <param name="groupSize">The number of items each group shall contain.</param>
42-
/// <returns>An enumeration of <typeparam name="T"/>[].</returns>
42+
/// <returns>An enumeration of T[].</returns>
4343
/// <remarks>An incomplete group at the end of the source collection will be silently dropped.</remarks>
4444
public static IEnumerable<T[]> Group<T>(this IEnumerable<T> source, int groupSize)
4545
{

src/SharedAssemblyInfo.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
[assembly: AssemblyProduct("Command Line Parser Library")]
77
[assembly: AssemblyCopyright("Copyright (c) 2005 - 2015 Giacomo Stelluti Scala")]
8+
[assembly: NeutralResourcesLanguage("en-US")]
9+
10+
// versions are replaced during CI build
811
[assembly: AssemblyVersion("2.0.275.0")]
912
[assembly: AssemblyFileVersion("2.0.275.0")]
10-
1113
[assembly: AssemblyInformationalVersion("2.0.275-beta")]
12-
[assembly: NeutralResourcesLanguage("en-US")]

0 commit comments

Comments
 (0)