Merging latest changes from main project (upstream) and resolving conflicts.

Author: jtongsbux

.editorconfig

@@ -0,0 +1,26 @@
+#top-most EditorConfig for project
+root = true
+
+[*]
+end_of_line = crlf
+insert_final_newline = true
+
+[*.cs]
+indent_style = space
+indent_size = 4
+
+[*.{xml,csproj,config}]
+indent_style = tab
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2

.paket/Paket.Restore.targets

@@ -1,26 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine", "src\CommandLine\CommandLine.csproj", "{E1BD3C65-49C3-49E7-BABA-C60980CB3F20}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Welcome", ".Welcome", "{D9C1F005-94A7-4A2A-81F3-9C053D5A6AEC}"
-	ProjectSection(SolutionItems) = preProject
-		License.md = License.md
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{751E6303-1623-4418-B298-4FF97DA5C86E}"
-	ProjectSection(SolutionItems) = preProject
-		demo\fsharp-demo.fsx = demo\fsharp-demo.fsx
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A6C99AE7-2FE1-4393-9281-7BFCF46A6F53}"
-	ProjectSection(SolutionItems) = preProject
-		build.fsx = build.fsx
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Tests", "tests\CommandLine.Tests\CommandLine.Tests.csproj", "{0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E}"
 EndProject
 Global
@@ -41,6 +25,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5B5A476C-82FB-49FB-B592-5224D9005186}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = src\CommandLine\CommandLine.csproj
 	EndGlobalSection

.paket/paket.bootstrapper.exe

@@ -1,8 +1,8 @@
-[![Build status](https://img.shields.io/appveyor/ci/commandlineparser/commandline.svg)](https://ci.appveyor.com/project/commandlineparser/commandline)
-[![Nuget](https://img.shields.io/nuget/dt/commandlineparser.svg)](http://nuget.org/packages/commandlineparser)
-[![Nuget](https://img.shields.io/nuget/v/commandlineparser.svg)](http://nuget.org/packages/commandlineparser)
-[![Nuget](https://img.shields.io/nuget/vpre/commandlineparser.svg)](http://nuget.org/packages/commandlineparser)
-[![Join the gitter chat!](https://badges.gitter.im/gsscoder/commandline.svg)](https://gitter.im/gsscoder/commandline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build status](https://ci.appveyor.com/api/projects/status/p61dj8udxs2aocmo/branch/master?svg=true)](https://ci.appveyor.com/project/commandlineparser/commandline/branch/master)
+[![NuGet](https://img.shields.io/nuget/dt/commandlineparser.svg)](http://nuget.org/packages/commandlineparser)
+[![NuGet](https://img.shields.io/nuget/v/commandlineparser.svg)](http://nuget.org/packages/commandlineparser)
+[![NuGet](https://img.shields.io/nuget/vpre/commandlineparser.svg)](http://nuget.org/packages/commandlineparser)
+[![Join the Gitter chat!](https://badges.gitter.im/gsscoder/commandline.svg)](https://gitter.im/gsscoder/commandline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # Command Line Parser Library for CLR and NetStandard
 
@@ -11,7 +11,7 @@
 The Command Line Parser Library offers CLR applications a clean and concise API for manipulating command line arguments and related tasks, such as defining switches, options and verb commands. It allows you to display a help screen with a high degree of customization and a simple way to report syntax errors to the end user.
 
 ```
-C:\Project> Nuget Install CommandLineParser
+C:\Project> NuGet Install CommandLineParser
 ```
 
 _NOTE: Mentioned F# Support is provided via ```CommandLineParser.FSharp``` package with FSharp dependencies._
@@ -20,7 +20,7 @@ __This library provides _hassle free_ command line parsing with a constantly upd
 
 # At a glance:
 
-- Compatible with __.NET Framework 4.0+__, __Mono 2.1+ Profile__, and __.Net Core__
+- Compatible with __.NET Framework 4.0+__, __Mono 2.1+ Profile__, and __.NET Core__
 - Doesn't depend on other packages (No dependencies beyond standard base libraries)
 - One line parsing using default singleton: `CommandLine.Parser.Default.ParseArguments(...)`.
 - Automatic or one line help screen generator: `HelpText.AutoBuild(...)`.
@@ -29,15 +29,15 @@ __This library provides _hassle free_ command line parsing with a constantly upd
 - You can also map to every type with a constructor that accepts a string (like `System.Uri`).
 - Define [verb commands](https://github.com/commandlineparser/commandline/wiki#verbs) similar to `git commit -a`.
 - Unparsing support: `CommandLine.Parser.Default.FormatCommandLine<T>(T options)`.
-- CommandLineParser.FSharp package is F#-friendly with support for `option<'a>`, see [demo](https://github.com/commandlineparser/commandline/blob/master/demo/fsharp-demo.fsx).  _NOTE: This is a separate Nuget package._
+- CommandLineParser.FSharp package is F#-friendly with support for `option<'a>`, see [demo](https://github.com/commandlineparser/commandline/blob/master/demo/fsharp-demo.fsx).  _NOTE: This is a separate NuGet package._
 - Most of features applies with a [CoC](http://en.wikipedia.org/wiki/Convention_over_configuration) philosophy.
 - C# demo: source [here](https://github.com/commandlineparser/commandline/tree/master/demo/ReadText.Demo).
 
 # Getting Started with the Command Line Parser Library
 
 You can utilize the parser library in several ways:
 
-- Install via Nuget/Paket
+- Install via NuGet/Paket: [https://www.nuget.org/packages/CommandLineParser/](https://www.nuget.org/packages/CommandLineParser/)
 - Integrate directly into your project by copying the .cs files into your project.
 - ILMerge during your build process.
 
@@ -98,7 +98,7 @@ class Options
   public bool Verbose { get; set; }
 
   [Option("stdin",
-	Default = false
+	Default = false,
 	HelpText = "Read from stdin")]
   public bool stdin { get; set; }
 
@@ -131,7 +131,7 @@ let main argv =
   | :? NotParsed<options> as notParsed -> fail notParsed.Errors
 ```
 
-VB.Net:
+VB.NET:
 
 ```VB.NET
 Class Options
@@ -175,11 +175,11 @@ class AddOptions {
 }
 [Verb("commit", HelpText = "Record changes to the repository.")]
 class CommitOptions {
-  //normal options here
+  //commit options here
 }
 [Verb("clone", HelpText = "Clone a repository into a new directory.")]
 class CloneOptions {
-  //normal options here
+  //clone options here
 }
 
 int Main(string[] args) {
@@ -192,7 +192,7 @@ int Main(string[] args) {
 }
 ```
 
-VB.Net example:
+VB.NET example:
 
 ```VB.NET
 <CommandLine.Verb("add", HelpText:="Add file contents to the index.")>
@@ -249,7 +249,7 @@ let main args =
   | :? CommandLine.NotParsed<obj> -> 1
 ```
 
-# Contibutors
+# Contributors
 First off, _Thank you!_  All contributions are welcome.  
 
 Please consider sticking with the GNU getopt standard for command line parsing.  

CommandLine.nuspec

@@ -1,14 +1,10 @@
-#version should be changed with any pull requests
-version: 2.2.{build}
+#version should be only changed with RELEASE eminent, see RELEASE.md
+version: 2.4.{build}
 
 clone_depth: 1
 pull_requests:
   do_not_increment_build_number: true
 
-#cache:
-#- packages -> paket.dependencies
-#- paket-files > paket.dependencies
-
 init:
   - ps: |
       git config --global core.autocrlf input
@@ -18,62 +14,43 @@ init:
         if($ver.StartsWith("v") -eq $true) { $ver = $ver.Substring(1) }
         Update-AppveyorBuild -Version $ver
       }
-      elseif([System.String]::IsNullOrEmpty($env:APPVEYOR_PULL_REQUEST_NUMBER) -eq $true) {
-        $ver = $env:APPVEYOR_BUILD_VERSION
-        $commit = $env:APPVEYOR_REPO_COMMIT.substring(0,7)
-        Update-AppveyorBuild -Version "$ver-$commit"
-      }
-
-#version patching
-assembly_info:
-  file: src\SharedAssemblyInfo.cs
-  patch: true
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: $(APPVEYOR_BUILD_VERSION)
-dotnet_csproj:
-  patch: true
-  file: '**\*.csproj'
-  version: '{version}'
-  package_version: '{version}'
-  assembly_version: '{version}'
-  file_version: '{version}'
-  informational_version: '{version}'
-
 
 environment:
   matrix:
     - BUILD_TARGET: base
-      NUSPEC_FILE: CommandLine
     - BUILD_TARGET: fsharp
-      NUSPEC_FILE: CommandLine.FSharp
 
 build_script:
-  - cmd: build.cmd %BUILD_TARGET%
+- cmd: dotnet build src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%
 
-after_build:
-- ps: |
-    powershell get-childitem Release\* -include *.dll | foreach-object { "{0}`t{1}" -f $_.Path, [System.Diagnostics.FileVersionInfo]::GetVersionInfo($_).FileVersion }
-    
-    .\build-nuget-pack.cmd $env:BUILD_TARGET $env:NUSPEC_FILE
+test_script: 
+- cmd: dotnet test tests/CommandLine.Tests/ /p:BuildTarget=%BUILD_TARGET%
 
-test: auto
+after_test:
+- cmd: dotnet pack src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%
 
 artifacts:
-- path: 'Release/**/*.nupkg'
-  name: NugetPackages
+- path: 'src/CommandLine/bin/Release/*.nupkg'
+  name: NuGetPackages
 
 on_failure:
 - cmd: |
     tree /f /a >files.lst
     appveyor PushArtifact .\files.lst -DeploymentName "Failed Build File Listing"
 
 deploy:
+- provider: GitHub
+  auth_token:
+    secure: hVyVwHl0JiVq0VxXB4VMRWbUtrGclIzadfnWFcWCQBLvbgMLahLBnWlwGglT63pZ
+  artifact: 'NuGetPackages'
+  prerelease: false
+  force_update: true #fsharp package runs as separate build job, so have to force_update to add fsharp.nuget added
+  on:
+    APPVEYOR_REPO_TAG: true
+
 - provider: NuGet
   api_key:
-    secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG
+    secure: Ab4T/48EyIJhVrqkfKdUxmHUtseEVuXuyrGACxZ0KN35rb/BzABlBM2YjZojicvT
   artifact: 'NuGetPackages'
   on:
-    branch: /master|v\d+\.\d+\.\d+[.*]/
     APPVEYOR_REPO_TAG: true
-