replace parser object creation with pluggable object factory

.gitignore

@@ -45,3 +45,5 @@ artifacts/*
 *.nuget.props
 *.DotSettings.user
 
+*/build/*
+build

appveyor.yml

@@ -1,9 +1,25 @@
+version: 0.0.1.{build}
+
+clone_depth: 1
+pull_requests:
+  do_not_increment_build_number: true
+
 init:
   - git config --global core.autocrlf input
+
 build_script:
   - cmd: build.cmd
+
 test: off
-version: 0.0.1.{build}
+
 artifacts:
-  - path: bin
-    name: bin
+- path: build/*.nupkg
+  name: NugetPackage
+
+deploy:
+- provider: NuGet
+  api_key:
+    secure: sQzzieUQGkTU0CvzXLcv5Wph6K7h3T+8teovqwa/Dzk1p9WhpmuUHiRxd3U0YhqO
+  artifact: 'NuGetPackage'
+  on:
+    branch: release

build.cmd

@@ -15,4 +15,7 @@ if errorlevel 1 (
 .\packages\FAKE\tools\Fake %*
 
 dotnet restore
-dotnet build --configuration Release --output build\netstandard1.5 --framework netstandard1.5 src\commandline
+dotnet build --configuration Release --output .\build\netstandard1.5 --framework netstandard1.5 src\commandline /p:PackageVersion=%APPVEYOR_BUILD_VERSION%
+
+dotnet restore  .\src\CommandLine\CommandLine.netstandard.csproj
+dotnet build --configuration Release --output .\build\netstandard2.0 --framework netstandard2.0 src\commandline\commandline.netstandard.csproj /p:PackageVersion=%APPVEYOR_BUILD_VERSION%

src/CommandLine/CommandLine.csproj

@@ -75,6 +75,7 @@
     <Compile Include="Core\Sequence.cs" />
     <Compile Include="Core\Switch.cs" />
     <Compile Include="ErrorExtensions.cs" />
+    <Compile Include="Infrastructure\DefaultObjectFactory.cs" />
     <Compile Include="Infrastructure\EnumerableExtensions`1.cs" />
     <Compile Include="Core\InstanceChooser.cs" />
     <Compile Include="Core\Tokenizer.cs">
@@ -83,6 +84,7 @@
     <Compile Include="Core\Verb.cs" />
     <Compile Include="Infrastructure\ExceptionExtensions.cs" />
     <Compile Include="Infrastructure\FSharpOptionHelper.cs" />
+    <Compile Include="Infrastructure\IObjectFactory.cs" />
     <Compile Include="Infrastructure\PopsicleSetter.cs" />
     <Compile Include="Infrastructure\ReferenceEqualityComparer.cs" />
     <Compile Include="Infrastructure\ReflectionHelper.cs" />
@@ -168,7 +170,7 @@
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
           <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -177,7 +179,7 @@
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
+    <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v2.2' Or $(TargetFrameworkVersion) == 'v2.3' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.1' Or $(TargetFrameworkVersion) == 'v4.2' Or $(TargetFrameworkVersion) == 'v4.3' Or $(TargetFrameworkVersion) == 'v4.4' Or $(TargetFrameworkVersion) == 'v4.4W' Or $(TargetFrameworkVersion) == 'v5.0' Or $(TargetFrameworkVersion) == 'v5.1' Or $(TargetFrameworkVersion) == 'v6.0' Or $(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1')) Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
           <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
@@ -186,37 +188,28 @@
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
+    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
-      <ItemGroup>
-        <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
+    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
+    <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>

src/CommandLine/CommandLine.netstandard.csproj

@@ -0,0 +1,63 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageId>CommandLine-NetStandard</PackageId>
+    <Authors>gsscoder, clmcgrath</Authors>
+    <Company />
+    <Product>CommandLine.netstandard20</Product>
+    <Description />
+    <Version>1.0.0.0</Version>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;CSX_EITHER_INTERNAL; CSX_REM_EITHER_BEYOND_2; CSX_ENUM_INTERNAL; ERRH_INTERNAL; ERRH_DISABLE_INLINE_METHODS; CSX_MAYBE_INTERNAL; CSX_REM_EITHER_FUNC;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;CSX_EITHER_INTERNAL; CSX_REM_EITHER_BEYOND_2; CSX_ENUM_INTERNAL; ERRH_INTERNAL; ERRH_DISABLE_INLINE_METHODS; CSX_MAYBE_INTERNAL; CSX_REM_EITHER_FUNC;RELEASE;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+  <Target Name="BeforeBuild" DependsOnTargets="PaketInstall">
+  </Target>
+  <Target Name="BootstrapPaket" Condition="!Exists('$(SolutionDir).paket/paket.bootstrapper.exe)')">
+    <Exec Command="$(SolutionDir).paket/paket.bootstrapper.exe" />
+  </Target>
+  <Target Name="PaketInstall" DependsOnTargets="BootstrapPaket" Condition="!Exists('$(SolutionDir)paket-files')">
+    <Exec Command="$(SolutionDir).paket/paket install" />
+  </Target>
+  <ItemGroup>
+    <Compile Remove="build\**" />
+    <EmbeddedResource Remove="build\**" />
+    <None Remove="build\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="Properties\AssemblyInfo.cs" />
+    <Compile Remove="Properties\" />
+    <Compile Include="..\..\paket-files\gsscoder\railwaysharp\src\RailwaySharp\ErrorHandling.cs">
+      <Paket>True</Paket>
+      <Link>Infrastructure/ErrorHandling.cs</Link>
+    </Compile>
+    <Compile Include="..\..\paket-files\gsscoder\CSharpx\src\CSharpx\EnumerableExtensions.cs">
+      <Paket>True</Paket>
+      <Link>Infrastructure/EnumerableExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\paket-files\gsscoder\CSharpx\src\CSharpx\Maybe.cs">
+      <Paket>True</Paket>
+      <Link>Infrastructure/Maybe.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FSharp.Core" Version="4.2.1" />
+    <PackageReference Include="Paket" Version="5.81.1" />
+    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>

src/CommandLine/Core/InstanceBuilder.cs

@@ -16,6 +16,7 @@ namespace CommandLine.Core
 {
     static class InstanceBuilder
     {
+
         public static ParserResult<T> Build<T>(
             Maybe<Func<T>> factory,
             Func<IEnumerable<string>, IEnumerable<OptionSpecification>, Result<IEnumerable<Token>, Error>> tokenizer,
@@ -82,7 +83,7 @@ public static ParserResult<T> Build<T>(
 
                 Func<T> buildMutable = () =>
                 {
-                    var mutable = factory.MapValueOrDefault(f => f(), Activator.CreateInstance<T>());
+                    var mutable = factory.MapValueOrDefault(f => f(), ParserSettings.ObjectFactory.Resolve<T>());
                     mutable =
                         mutable.SetProperties(specPropsWithValue, sp => sp.Value.IsJust(), sp => sp.Value.FromJustOrFail())
                             .SetProperties(

src/CommandLine/Core/ReflectionExtensions.cs

@@ -168,7 +168,7 @@ public static object AutoDefault(this Type type)
         {
             if (type.IsMutable())
             {
-                return Activator.CreateInstance(type);
+                return ParserSettings.ObjectFactory.Resolve(type);
             }
 
             var ctorTypes = type.GetSpecifications(pi => pi.PropertyType).ToArray();
@@ -183,10 +183,11 @@ public static TypeInfo ToTypeInfo(this Type type)
 
         public static object StaticMethod(this Type type, string name, params object[] args)
         {
-#if NETSTANDARD1_5
+#if NETSTANDARD1_5 || NETSTANDARD2_0
             MethodInfo method = type.GetTypeInfo().GetDeclaredMethod(name);
             return method.Invoke(null, args);
 #else
+
             return type.GetTypeInfo().InvokeMember(
                 name,
                 BindingFlags.InvokeMethod | BindingFlags.Public | BindingFlags.Static,
@@ -198,7 +199,7 @@ public static object StaticMethod(this Type type, string name, params object[] a
 
         public static object StaticProperty(this Type type, string name)
         {
-#if NETSTANDARD1_5
+#if NETSTANDARD1_5 || NETSTANDARD2_0
             PropertyInfo property = type.GetTypeInfo().GetDeclaredProperty(name);
             return property.GetValue(null);
 #else
@@ -213,7 +214,7 @@ public static object StaticProperty(this Type type, string name)
 
         public static object InstanceProperty(this Type type, string name, object target)
         {
-#if NETSTANDARD1_5
+#if NETSTANDARD1_5 || NETSTANDARD2_0
             PropertyInfo property = type.GetTypeInfo().GetDeclaredProperty(name);
             return property.GetValue(target);
 #else

src/CommandLine/Infrastructure/DefaultObjectFactory.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace CommandLine.Infrastructure
+{
+    /// <summary>
+    /// Default object factory to use with parser, defaults to Activator.CreateInstance() 
+    /// </summary>
+    public class DefaultObjectFactory : IObjectFactory
+    {
+        /// <inheritdoc />
+        public T Resolve<T>()
+        {
+            return Activator.CreateInstance<T>();
+        }
+
+        /// <inheritdoc />
+        public object Resolve(Type type)
+        {
+            return Activator.CreateInstance(type);
+        }
+    }
+}

src/CommandLine/Infrastructure/FSharpOptionHelper.cs

@@ -14,9 +14,14 @@ public static Type GetUnderlyingType(Type type)
         {
             return type
 #if NETSTANDARD1_5
-                .GetTypeInfo()
-#endif
+                .GetTypeInfo().GetGenericArguments()[0];
+#elif NETSTANDARD2_0
+                .GenericTypeArguments[0];
+#else
                 .GetGenericArguments()[0];
+#endif
+
+
         }
 
         public static object Some(Type type, object value)

src/CommandLine/Infrastructure/IObjectFactory.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CommandLine.Infrastructure
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface IObjectFactory
+    {
+        /// <summary>
+        /// Creates an instance of specified type "/>
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        T Resolve<T>();
+        /// <summary>
+        /// Creates an instance of specified type "/>
+        /// </summary>
+        /// /// <param name="type"></param>
+        /// <returns></returns>
+        object Resolve(Type type);
+    }
+}

src/CommandLine/Infrastructure/ReflectionHelper.cs

@@ -103,7 +103,7 @@ private static Assembly GetExecutingOrEntryAssembly()
         {
             var assembly = Assembly.GetEntryAssembly();
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_5 && !NETSTANDARD2_0
             assembly = assembly ?? Assembly.GetExecutingAssembly();
 #endif
 

src/CommandLine/Parser.cs

@@ -88,7 +88,7 @@ public ParserResult<T> ParseArguments<T>(IEnumerable<string> args)
             if (args == null) throw new ArgumentNullException("args");
 
             var factory = typeof(T).IsMutable()
-                ? Maybe.Just<Func<T>>(Activator.CreateInstance<T>)
+                ? Maybe.Just<Func<T>>(ParserSettings.ObjectFactory.Resolve<T>)
                 : Maybe.Nothing<Func<T>>();
 
             return MakeParserResult(
@@ -103,6 +103,7 @@ public ParserResult<T> ParseArguments<T>(IEnumerable<string> args)
                 settings);
         }
 
+
         /// <summary>
         /// Parses a string array of command line arguments constructing values in an instance of type <typeparamref name="T"/>.
         /// Grammar rules are defined decorating public properties with appropriate attributes.
@@ -114,7 +115,6 @@ public ParserResult<T> ParseArguments<T>(IEnumerable<string> args)
         /// and a sequence of <see cref="CommandLine.Error"/>.</returns>
         /// <exception cref="System.ArgumentNullException">Thrown if one or more arguments are null.</exception>
         public ParserResult<T> ParseArguments<T>(Func<T> factory, IEnumerable<string> args)
-            where T : new()
         {
             if (factory == null) throw new ArgumentNullException("factory");
             if (!typeof(T).IsMutable()) throw new ArgumentException("factory");
@@ -222,4 +222,5 @@ private void Dispose(bool disposing)
             }
         }
     }
+
 }

src/CommandLine/ParserSettings.cs

@@ -32,6 +32,7 @@ public ParserSettings()
             caseSensitive = true;
             caseInsensitiveEnumValues = false;
             parsingCulture = CultureInfo.InvariantCulture;
+
             try
             {
                 maximumDisplayWidth = Console.WindowWidth;
@@ -42,6 +43,11 @@ public ParserSettings()
             }
         }
 
+        /// <summary>
+        /// Object Factory to use for new instances
+        /// </summary>
+        public static IObjectFactory ObjectFactory { get; set; } = new DefaultObjectFactory();
+
         /// <summary>
         /// Finalizes an instance of the <see cref="CommandLine.ParserSettings"/> class.
         /// </summary>
@@ -50,6 +56,7 @@ public ParserSettings()
             Dispose(false);
         }
 
+
         /// <summary>
         /// Gets or sets a value indicating whether perform case sensitive comparisons.
         /// Note that case insensitivity only applies to <i>parameters</i>, not the values

src/CommandLine/Text/HelpText.cs

@@ -694,7 +694,7 @@ private static Maybe<Tuple<UsageAttribute, IEnumerable<Example>>> GetUsageFromTy
                     var prop = tuple.Item1;
                     var attr = tuple.Item2;
 
-#if NETSTANDARD1_5
+#if NETSTANDARD1_5 || NETSTANDARD2_0
                     var examples = (IEnumerable<Example>)prop.GetValue(null);
 #else
                     var examples = (IEnumerable<Example>)prop