hotfix/issue 213 fsharp dependency

.gitignore

@@ -38,3 +38,4 @@ artifacts/*
 # Visual Studio 2015 cache/options directory
 .vs/
 
+[R|r]elease/** 

.paket/Paket.Restore.targets

@@ -18,6 +18,11 @@
     <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
     <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+
+    <!-- .net core fdd -->
+    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>

CommandLine.nuspec

@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>CommandLineParser</id>
-    <version>$version$</version>
-    <title>Command Line Parser Library</title>
-    <authors>gsscoder nemec ericnewton76</authors>
-    <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>
-    <releaseNotes />
-    <copyright>Copyright (c) 2005 - 2018 Giacomo Stelluti Scala &amp; Contributors</copyright>
-    <licenseUrl>https://github.com/commandlineparser/commandline/blob/master/License.md</licenseUrl>
-    <projectUrl>https://github.com/commandlineparser/commandline</projectUrl>
-    <owners>Giacomo Stelluti Scala</owners>
-    <iconUrl>https://raw.githubusercontent.com/commandlineparser/commandline/master/art/CommandLine20.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <tags>command line commandline argument option parser parsing library syntax shell</tags>
-    <dependencies>
-      <group targetFramework=".NETStandard1.5">
-        <dependency id="System.Collections" version="4.0.11-rc2-24027" />
-        <dependency id="System.Console" version="4.0.0-rc2-24027" />
-        <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" />
-        <dependency id="System.Globalization" version="4.0.11-rc2-24027" />
-        <dependency id="System.IO" version="4.1.0-rc2-24027" />
-        <dependency id="System.Linq" version="4.1.0-rc2-24027" />
-        <dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
-        <dependency id="System.Reflection" version="4.1.0-rc2-24027" />
-        <dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
-        <dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-24027" />
-        <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
-        <dependency id="System.Runtime" version="4.1.0-rc2-24027" />
-        <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="build\CommandLine.dll" target="lib\net40\CommandLine.dll" />
-    <file src="build\CommandLine.XML" target="lib\net40\CommandLine.XML" />
-    <file src="build\CommandLine.dll" target="lib\net45\CommandLine.dll" />
-    <file src="build\CommandLine.XML" target="lib\net45\CommandLine.XML" />
-    <file src="build\netstandard1.5\CommandLine.dll" target="lib\netstandard1.5\CommandLine.dll" />
-    <file src="build\CommandLine.XML" target="lib\netstandard1.5\CommandLine.xml" />
-    <file src="readme.md" target="readme.md" />
-  </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>CommandLineParser</id>
+    <version>$version$</version>
+    <title>Command Line Parser Library</title>
+    <authors>gsscoder nemec ericnewton76</authors>
+    <description>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>
+    <releaseNotes />
+    <copyright>Copyright (c) 2005 - 2018 Giacomo Stelluti Scala &amp; Contributors</copyright>
+    <licenseUrl>https://github.com/commandlineparser/commandline/blob/master/License.md</licenseUrl>
+    <projectUrl>https://github.com/commandlineparser/commandline</projectUrl>
+    <owners>Giacomo Stelluti Scala</owners>
+    <iconUrl>https://raw.githubusercontent.com/commandlineparser/commandline/master/art/CommandLine20.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <tags>command line commandline argument option parser parsing library syntax shell</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard1.5">
+        <dependency id="System.Collections" version="4.0.11-rc2-24027" />
+        <dependency id="System.Console" version="4.0.0-rc2-24027" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" />
+        <dependency id="System.Globalization" version="4.0.11-rc2-24027" />
+        <dependency id="System.IO" version="4.1.0-rc2-24027" />
+        <dependency id="System.Linq" version="4.1.0-rc2-24027" />
+        <dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
+        <dependency id="System.Reflection" version="4.1.0-rc2-24027" />
+        <dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
+        <dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-24027" />
+        <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
+        <dependency id="System.Runtime" version="4.1.0-rc2-24027" />
+        <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="net4x\CommandLine.dll" target="lib\net40\CommandLine.dll" />
+    <file src="net4x\CommandLine.XML" target="lib\net40\CommandLine.XML" />
+    <file src="net4x\CommandLine.dll" target="lib\net45\CommandLine.dll" />
+    <file src="net4x\CommandLine.XML" target="lib\net45\CommandLine.XML" />
+    <file src="netstandard1.5\CommandLine.dll" target="lib\netstandard1.5\CommandLine.dll" />
+    <file src="netstandard1.5\CommandLine.XML" target="lib\netstandard1.5\CommandLine.xml" />
+    <file src="readme.md" target="readme.md" />
+  </files>
+</package>

Commandline.FSharp.nuspec

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>CommandLineParser.FSharp</id>
+    <version>$version$</version>
+    <title>Command Line Parser Library</title>
+    <authors>gsscoder nemec ericnewton76</authors>
+    <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>
+    <releaseNotes />
+    <copyright>Copyright (c) 2005 - 2018 Giacomo Stelluti Scala &amp; Contributors</copyright>
+    <licenseUrl>https://github.com/commandlineparser/commandline/blob/master/License.md</licenseUrl>
+    <projectUrl>https://github.com/commandlineparser/commandline</projectUrl>
+    <owners>Giacomo Stelluti Scala</owners>
+    <iconUrl>https://raw.githubusercontent.com/commandlineparser/commandline/master/art/CommandLine20.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <tags>command line commandline argument option parser parsing library syntax shell</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard1.5">
+        <dependency id="System.Collections" version="4.0.11-rc2-24027" />
+        <dependency id="System.Console" version="4.0.0-rc2-24027" />
+        <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" />
+        <dependency id="System.Globalization" version="4.0.11-rc2-24027" />
+        <dependency id="System.IO" version="4.1.0-rc2-24027" />
+        <dependency id="System.Linq" version="4.1.0-rc2-24027" />
+        <dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
+        <dependency id="System.Reflection" version="4.1.0-rc2-24027" />
+        <dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
+        <dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-24027" />
+        <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
+        <dependency id="System.Runtime" version="4.1.0-rc2-24027" />
+        <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" />
+      </group>
+      <group targetFramework="net40">
+        <dependency id="FSharp.Core" version="4.0.0.1" />
+      </group>
+      <group targetFramework="net45">
+        <dependency id="FSharp.Core" version="4.0.0.1" />
+      </group>    
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="net4x\CommandLine.dll" target="lib\net40\CommandLine.dll" />
+    <file src="net4x\CommandLine.XML" target="lib\net40\CommandLine.XML" />
+    <file src="net4x\CommandLine.dll" target="lib\net45\CommandLine.dll" />
+    <file src="net4x\CommandLine.XML" target="lib\net45\CommandLine.XML" />
+    <file src="netstandard1.5\CommandLine.dll" target="lib\netstandard1.5\CommandLine.dll" />
+    <file src="netstandard1.5\CommandLine.XML" target="lib\netstandard1.5\CommandLine.xml" />
+    <file src="readme.md" target="readme.md" />
+  </files>
+</package>

appveyor.yml

@@ -24,27 +24,44 @@ init:
         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
+  - cmd: build.cmd %BUILD_TARGET%
 
 after_build:
 - ps: |
-    get-childitem build\* -include *.dll | foreach-object { "{0}`t{1}" -f $_.Name, [System.Diagnostics.FileVersionInfo]::GetVersionInfo($_).FileVersion }
+    powershell get-childitem Release\* -include *.dll | foreach-object { "{0}`t{1}" -f $_.Path, [System.Diagnostics.FileVersionInfo]::GetVersionInfo($_).FileVersion }
 
-    nuget pack CommandLine.nuspec -version "$env:APPVEYOR_BUILD_VERSION"
+    .\build-nuget-pack.cmd $env:BUILD_TARGET $env:NUSPEC_FILE
 
-test: off  #tests handled within FAKE
+test: auto
 
 artifacts:
-- path: '*.nupkg'
-  name: NugetPackage
+- path: 'Release/**/*.nupkg'
+  name: NugetPackages
 
 on_failure:
 - cmd: |
@@ -55,8 +72,8 @@ deploy:
 - provider: NuGet
   api_key:
     secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG
-  artifact: 'NuGetPackage'
+  artifact: 'NuGetPackages'
   on:
-    branch: master
+    branch: /master|v\d+\.\d+\.\d+[.*]/
     APPVEYOR_REPO_TAG: true
 

build-nuget-pack.cmd

@@ -0,0 +1,19 @@
+@ECHO OFF
+setlocal
+
+if "%1" == "" goto :USAGE
+if "%2" == "" goto :USAGE
+
+pushd Release\%1
+
+copy ..\..\README.md
+copy ..\..\%2.nuspec .
+nuget pack "%2.nuspec" -properties Version=%APPVEYOR_BUILD_VERSION%
+if errorlevel 1 popd&exit 1 /b
+goto :END
+
+:USAGE
+echo build-nuget-pack <build_target> <nuspec_file_name>
+
+:END
+popd

build.cmd

@@ -1,7 +1,12 @@
 @echo off
+setlocal
 
 cls
 
+if "%1" == "" goto :USAGE
+if "%1" == "base" set BUILD_TARGET=base
+if "%1" == "fsharp" set BUILD_TARGET=fsharp
+
 echo.
 echo SKIP_RESTORE=%SKIP_RESTORE% ^<^< Set to true if have already restored packages
 if "%SKIP_RESTORE%" == "" choice /T 5 /D Y /M "Continue?"
@@ -19,8 +24,8 @@ if errorlevel 1 (
 
 :BUILD_NET
 echo.
-echo Fake build.fsx
-.\packages\FAKE\tools\Fake %*
+
+msbuild CommandLine.sln /p:Configuration=Release /p:OutputPath=%~dp0\release\%BUILD_TARGET%\net4x
 
 if "%SKIP_RESTORE%" == "true" goto :BUILD_NETSTD
 echo.
@@ -29,5 +34,16 @@ dotnet restore
 
 :BUILD_NETSTD
 echo.
-echo dotnet build
-dotnet build --configuration Release --output build\netstandard1.5 --framework netstandard1.5 src\commandline
+echo dotnet build --output %~dp0\release\%BUILD_TARGET%\netstandard1.5
+dotnet build --configuration Release --output %~dp0release\%BUILD_TARGET%\netstandard1.5 --framework netstandard1.5 src\commandline
+
+goto :END
+
+:USAGE
+echo.
+echo Invalid arguments specified.
+echo.
+echo Usage: build <build_target>
+echo  where <build_target> is base or fsharp
+
+:END