From 94e4f35211186aa7bc1decf201dd8e402033ac73 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Thu, 2 Nov 2017 15:32:38 -0400 Subject: [PATCH 1/9] added cache packages to minimize redundant package downloading --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index ebc8c428..7ead3f53 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,10 +3,13 @@ version: 0.0.1.{build} clone_depth: 1 pull_requests: do_not_increment_build_number: true +cache: +- packages -> paket.dependencies init: - git config --global core.autocrlf input + build_script: - cmd: build.cmd From add33a5b96c0215cbc6de7e7abc34cc44a99a1af Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Thu, 2 Nov 2017 15:44:04 -0400 Subject: [PATCH 2/9] add nuget pack command --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7ead3f53..8c5dc7bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,10 @@ init: build_script: - cmd: build.cmd -test: off +after_build: +- cmd: nuget pack CommandLine.nuspec -version %APPVEYOR_BUILD_VERSION% + +test: off #tests handled within FAKE build artifacts: - path: build/*.nupkg From 5d6d5be252b2b199d76d8ced21667767e2002fb5 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Sat, 2 Dec 2017 15:28:10 -0500 Subject: [PATCH 3/9] modified nuspec to abstract the version number and Contributors line --- CommandLine.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommandLine.nuspec b/CommandLine.nuspec index c517e43c..4d4fde5a 100644 --- a/CommandLine.nuspec +++ b/CommandLine.nuspec @@ -2,12 +2,12 @@ CommandLineParser - 2.1.0-beta2 + $version$ Command Line Parser Library Giacomo Stelluti Scala 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. - Copyright (c) 2005 - 2016 Giacomo Stelluti Scala + Copyright (c) 2005 - 2017 Giacomo Stelluti Scala & Contributors https://github.com/commandlineparser/commandline/blob/master/License.md https://github.com/commandlineparser/commandline Giacomo Stelluti Scala From bea116c632fbafeef353c06c3474a4bb7a26dcc0 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Sat, 2 Dec 2017 15:34:46 -0500 Subject: [PATCH 4/9] slight restructure and comment for SharedAssemblyInfo getting changed during CI build --- src/SharedAssemblyInfo.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 91a1085d..25e1cd7d 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -5,8 +5,9 @@ [assembly: AssemblyProduct("Command Line Parser Library")] [assembly: AssemblyCopyright("Copyright (c) 2005 - 2015 Giacomo Stelluti Scala")] +[assembly: NeutralResourcesLanguage("en-US")] + +// versions are replaced during CI build [assembly: AssemblyVersion("2.0.275.0")] [assembly: AssemblyFileVersion("2.0.275.0")] - [assembly: AssemblyInformationalVersion("2.0.275-beta")] -[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file From 142da4f95c1457cafce8547e1cfe990067f2e097 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Sat, 2 Dec 2017 15:35:07 -0500 Subject: [PATCH 5/9] fixed documentation warnings from compiler --- src/CommandLine/Infrastructure/EnumerableExtensions`1.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs b/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs index 7266aede..056fa152 100644 --- a/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs +++ b/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs @@ -37,9 +37,9 @@ public static bool Empty(this IEnumerable source) /// /// Breaks a collection into groups of a specified size. /// - /// A collection of . + /// A collection of . /// The number of items each group shall contain. - /// An enumeration of []. + /// An enumeration of T[]. /// An incomplete group at the end of the source collection will be silently dropped. public static IEnumerable Group(this IEnumerable source, int groupSize) { From 5ae6f1d7e173e67838df4078219004eb11f91d47 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Sat, 2 Dec 2017 15:46:24 -0500 Subject: [PATCH 6/9] changes to gitignore for more universal ignore --- .gitignore | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 77b9880e..5ab174bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,27 @@ -src/CommandLine/bin/* -src/CommandLine/obj -src/CommandLine.dotnet/bin/* -src/CommandLine.dotnet/obj -demo/ReadText.Demo/bin/* -demo/ReadText.Demo/obj -/demo/ReadText.Demo.VB/bin/* -/demo/ReadText.Demo.VB/obj -tests/CommandLine.Tests/bin/* -tests/CommandLine.Tests/obj -tests/CommandLine.DotNet.Tests/bin/* -tests/CommandLine.DotNet.Tests/obj -tests/CommandLine.Tests.Properties/bin/* -tests/CommandLine.Tests.Properties/obj -src/templates/CSharpTemplate/bin/* -src/templates/CSharpTemplate/obj -src/templates/VBNetTemplate/bin/* -src/templates/VBNetTemplate/obj + +#ignore build outputs +[B|b]in +[O|o]bj build/* + +#ignore managed external libs packages paket-files + *.suo *.userprefs *~ \#*\# *.pidb + +#ignore Test results/temps *.test-cache tests/CommandLine/test-results/* tests/CommandLine.Tests/test-results/* +TestResult.xml + *.DS_Store *.csproj.user -TestResult.xml *.nupkg *.old StyleCop.Cache @@ -43,6 +35,6 @@ artifacts/* *.lock.json *.nuget.props *.DotSettings.user -# Visual Studio 2015 cache/options directory -.vs/ +# Visual Studio 2015 cache/options directory +.vs/ From 26dac3b516bf5e7d1d8e6c906b3f948222459e0c Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Mon, 4 Dec 2017 11:06:40 -0500 Subject: [PATCH 7/9] updates to appveyor for branch based deployments/versioning/etc --- appveyor.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8c5dc7bf..b4747870 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,23 @@ -version: 0.0.1.{build} +version: 2.2.0.{build} clone_depth: 1 pull_requests: do_not_increment_build_number: true + cache: - packages -> paket.dependencies init: - git config --global core.autocrlf input - + - ps: >- + if ($env:APPVEYOR_REPO_TAG -eq "true") + { + Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME" + } + else + { + Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.substring(0,7))" + } build_script: - cmd: build.cmd @@ -25,7 +34,9 @@ artifacts: deploy: - provider: NuGet api_key: - secure: sQzzieUQGkTU0CvzXLcv5Wph6K7h3T+8teovqwa/Dzk1p9WhpmuUHiRxd3U0YhqO + secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG artifact: 'NuGetPackage' on: - branch: release + branch: master + APPVEYOR_REPO_TAG: true + From 605358f072a677a1a1e391c4e8653dca10faf698 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Mon, 4 Dec 2017 13:26:27 -0500 Subject: [PATCH 8/9] comment to version --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index b4747870..6e8dc26d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,4 @@ +#version should be changed with any pull requests version: 2.2.0.{build} clone_depth: 1 From aab51fe4279966d3c0363dd8dd58f392dd744446 Mon Sep 17 00:00:00 2001 From: Eric Newton Date: Sat, 30 Dec 2017 00:06:16 -0500 Subject: [PATCH 9/9] build-updates --- appveyor.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6e8dc26d..70e9da61 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,15 +9,24 @@ cache: - packages -> paket.dependencies init: - - git config --global core.autocrlf input - - ps: >- + - ps: > + git config --global core.autocrlf input + if ($env:APPVEYOR_REPO_TAG -eq "true") + { + Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME" + } + else + { - Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.substring(0,7))" + $ver = $env:APPVEYOR_BUILD_VERSION + $commit = $env:APPVEYOR_REPO_COMMIT.substring(0,7) + Update-AppveyorBuild -Version "$ver-$commit" + } build_script: @@ -26,10 +35,10 @@ build_script: after_build: - cmd: nuget pack CommandLine.nuspec -version %APPVEYOR_BUILD_VERSION% -test: off #tests handled within FAKE build +test: off #tests handled within FAKE artifacts: -- path: build/*.nupkg +- path: '*.nupkg' name: NugetPackage deploy: @@ -40,4 +49,3 @@ deploy: on: branch: master APPVEYOR_REPO_TAG: true -