From fc67a2a83581442cac80088f9a2db6b6d1f3815a Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Mon, 10 Jul 2017 17:21:28 -0400 Subject: [PATCH 01/12] replace parser object creation with pluggable object factory allow all objects to be specified with ParseArguments() add overridable object factory call --- src/CommandLine/CommandLine.csproj | 26 +++++--------- .../Infrastructure/ObjectFactory.cs | 34 +++++++++++++++++++ src/CommandLine/Parser.cs | 15 ++++++-- src/CommandLine/ParserSettings.cs | 7 ++++ 4 files changed, 63 insertions(+), 19 deletions(-) create mode 100644 src/CommandLine/Infrastructure/ObjectFactory.cs diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj index 7b791726..d2d72467 100644 --- a/src/CommandLine/CommandLine.csproj +++ b/src/CommandLine/CommandLine.csproj @@ -83,6 +83,7 @@ + @@ -168,7 +169,7 @@ - + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -177,7 +178,7 @@ - + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll @@ -186,37 +187,28 @@ - + - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True - + - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True - + - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True diff --git a/src/CommandLine/Infrastructure/ObjectFactory.cs b/src/CommandLine/Infrastructure/ObjectFactory.cs new file mode 100644 index 00000000..4016ed8a --- /dev/null +++ b/src/CommandLine/Infrastructure/ObjectFactory.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CommandLine.Infrastructure +{ + /// + /// + /// + public interface ObjectFactory + { + /// + /// Creates and instance of + /// + /// + T CreateInstance(); + } + + /// + /// Default object factory to use with parser, defaults to Activator.CreateInstance() + /// + public class DefaultObjectFactory : ObjectFactory + { + /// + /// Creates and instance of + /// + /// + public T CreateInstance() + { + return Activator.CreateInstance(); + } + } +} diff --git a/src/CommandLine/Parser.cs b/src/CommandLine/Parser.cs index 69a7e862..df3b415e 100644 --- a/src/CommandLine/Parser.cs +++ b/src/CommandLine/Parser.cs @@ -88,7 +88,7 @@ public ParserResult ParseArguments(IEnumerable args) if (args == null) throw new ArgumentNullException("args"); var factory = typeof(T).IsMutable() - ? Maybe.Just>(Activator.CreateInstance) + ? Maybe.Just>(CreateInstance) : Maybe.Nothing>(); return MakeParserResult( @@ -103,6 +103,17 @@ public ParserResult ParseArguments(IEnumerable args) settings); } + /// + /// Create Instance to use for binding + /// Override to add container resolution + /// + /// + /// + protected virtual T CreateInstance() + { + return settings.DefaultObjectFactory.CreateInstance(); + } + /// /// Parses a string array of command line arguments constructing values in an instance of type . /// Grammar rules are defined decorating public properties with appropriate attributes. @@ -114,7 +125,6 @@ public ParserResult ParseArguments(IEnumerable args) /// and a sequence of . /// Thrown if one or more arguments are null. public ParserResult ParseArguments(Func factory, IEnumerable args) - where T : new() { if (factory == null) throw new ArgumentNullException("factory"); if (!typeof(T).IsMutable()) throw new ArgumentException("factory"); @@ -222,4 +232,5 @@ private void Dispose(bool disposing) } } } + } \ No newline at end of file diff --git a/src/CommandLine/ParserSettings.cs b/src/CommandLine/ParserSettings.cs index 93962566..1d907f86 100644 --- a/src/CommandLine/ParserSettings.cs +++ b/src/CommandLine/ParserSettings.cs @@ -32,6 +32,7 @@ public ParserSettings() caseSensitive = true; caseInsensitiveEnumValues = false; parsingCulture = CultureInfo.InvariantCulture; + DefaultObjectFactory = new DefaultObjectFactory(); try { maximumDisplayWidth = Console.WindowWidth; @@ -50,6 +51,12 @@ public ParserSettings() Dispose(false); } + + /// + /// Sets the default object factory to use for instance creation + /// + public ObjectFactory DefaultObjectFactory { get; set; } + /// /// Gets or sets a value indicating whether perform case sensitive comparisons. /// Note that case insensitivity only applies to parameters, not the values From f37cb5e66cfab273032929c6b70ac89af77c9dd9 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Mon, 10 Jul 2017 17:21:28 -0400 Subject: [PATCH 02/12] replace parser object creation with pluggable object factory allow all objects to be specified with ParseArguments() add overridable object factory call --- src/CommandLine/CommandLine.csproj | 26 +++++--------- .../Infrastructure/ObjectFactory.cs | 34 +++++++++++++++++++ src/CommandLine/Parser.cs | 15 ++++++-- src/CommandLine/ParserSettings.cs | 7 ++++ 4 files changed, 63 insertions(+), 19 deletions(-) create mode 100644 src/CommandLine/Infrastructure/ObjectFactory.cs diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj index 7b791726..d2d72467 100644 --- a/src/CommandLine/CommandLine.csproj +++ b/src/CommandLine/CommandLine.csproj @@ -83,6 +83,7 @@ + @@ -168,7 +169,7 @@ - + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -177,7 +178,7 @@ - + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll @@ -186,37 +187,28 @@ - + - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll True True - + - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll True True - + - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll True True diff --git a/src/CommandLine/Infrastructure/ObjectFactory.cs b/src/CommandLine/Infrastructure/ObjectFactory.cs new file mode 100644 index 00000000..a232f71c --- /dev/null +++ b/src/CommandLine/Infrastructure/ObjectFactory.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CommandLine.Infrastructure +{ + /// + /// + /// + public interface IObjectFactory + { + /// + /// Creates and return a new instance of + /// + /// + T CreateInstance(); + } + + /// + /// Default object factory to use with parser, defaults to Activator.CreateInstance() + /// + public class DefaultObjectFactory : IObjectFactory + { + /// + /// Creates a new instance to be used by parser model creation/> + /// + /// + public T CreateInstance() + { + return Activator.CreateInstance(); + } + } +} diff --git a/src/CommandLine/Parser.cs b/src/CommandLine/Parser.cs index 69a7e862..df3b415e 100644 --- a/src/CommandLine/Parser.cs +++ b/src/CommandLine/Parser.cs @@ -88,7 +88,7 @@ public ParserResult ParseArguments(IEnumerable args) if (args == null) throw new ArgumentNullException("args"); var factory = typeof(T).IsMutable() - ? Maybe.Just>(Activator.CreateInstance) + ? Maybe.Just>(CreateInstance) : Maybe.Nothing>(); return MakeParserResult( @@ -103,6 +103,17 @@ public ParserResult ParseArguments(IEnumerable args) settings); } + /// + /// Create Instance to use for binding + /// Override to add container resolution + /// + /// + /// + protected virtual T CreateInstance() + { + return settings.DefaultObjectFactory.CreateInstance(); + } + /// /// Parses a string array of command line arguments constructing values in an instance of type . /// Grammar rules are defined decorating public properties with appropriate attributes. @@ -114,7 +125,6 @@ public ParserResult ParseArguments(IEnumerable args) /// and a sequence of . /// Thrown if one or more arguments are null. public ParserResult ParseArguments(Func factory, IEnumerable args) - where T : new() { if (factory == null) throw new ArgumentNullException("factory"); if (!typeof(T).IsMutable()) throw new ArgumentException("factory"); @@ -222,4 +232,5 @@ private void Dispose(bool disposing) } } } + } \ No newline at end of file diff --git a/src/CommandLine/ParserSettings.cs b/src/CommandLine/ParserSettings.cs index 93962566..f591d8dc 100644 --- a/src/CommandLine/ParserSettings.cs +++ b/src/CommandLine/ParserSettings.cs @@ -32,6 +32,7 @@ public ParserSettings() caseSensitive = true; caseInsensitiveEnumValues = false; parsingCulture = CultureInfo.InvariantCulture; + DefaultObjectFactory = new DefaultObjectFactory(); try { maximumDisplayWidth = Console.WindowWidth; @@ -50,6 +51,12 @@ public ParserSettings() Dispose(false); } + + /// + /// Sets the default object factory to use for instance creation + /// + public IObjectFactory DefaultObjectFactory { get; set; } + /// /// Gets or sets a value indicating whether perform case sensitive comparisons. /// Note that case insensitivity only applies to parameters, not the values From 9b2d32504c860d3546654f24999ac7b53731832f Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 11 Jul 2017 16:52:44 -0400 Subject: [PATCH 03/12] added static swappable ObjectFactory implementation --- src/CommandLine/CommandLine.csproj | 3 +- src/CommandLine/Core/InstanceBuilder.cs | 3 +- src/CommandLine/Core/ReflectionExtensions.cs | 2 +- .../Infrastructure/DefaultObjectFactory.cs | 22 ++++++++++++ .../Infrastructure/IObjectFactory.cs | 25 ++++++++++++++ .../Infrastructure/ObjectFactory.cs | 34 ------------------- src/CommandLine/Parser.cs | 12 +------ src/CommandLine/ParserSettings.cs | 14 ++++---- 8 files changed, 60 insertions(+), 55 deletions(-) create mode 100644 src/CommandLine/Infrastructure/DefaultObjectFactory.cs create mode 100644 src/CommandLine/Infrastructure/IObjectFactory.cs delete mode 100644 src/CommandLine/Infrastructure/ObjectFactory.cs diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj index d2d72467..d645ed6c 100644 --- a/src/CommandLine/CommandLine.csproj +++ b/src/CommandLine/CommandLine.csproj @@ -75,6 +75,7 @@ + @@ -83,7 +84,7 @@ - + diff --git a/src/CommandLine/Core/InstanceBuilder.cs b/src/CommandLine/Core/InstanceBuilder.cs index 0c24fddd..dcebc0d6 100644 --- a/src/CommandLine/Core/InstanceBuilder.cs +++ b/src/CommandLine/Core/InstanceBuilder.cs @@ -16,6 +16,7 @@ namespace CommandLine.Core { static class InstanceBuilder { + public static ParserResult Build( Maybe> factory, Func, IEnumerable, Result, Error>> tokenizer, @@ -82,7 +83,7 @@ public static ParserResult Build( Func buildMutable = () => { - var mutable = factory.MapValueOrDefault(f => f(), Activator.CreateInstance()); + var mutable = factory.MapValueOrDefault(f => f(), ParserSettings.ObjectFactory.Resolve()); mutable = mutable.SetProperties(specPropsWithValue, sp => sp.Value.IsJust(), sp => sp.Value.FromJustOrFail()) .SetProperties( diff --git a/src/CommandLine/Core/ReflectionExtensions.cs b/src/CommandLine/Core/ReflectionExtensions.cs index 3b011316..113aadc6 100644 --- a/src/CommandLine/Core/ReflectionExtensions.cs +++ b/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(); diff --git a/src/CommandLine/Infrastructure/DefaultObjectFactory.cs b/src/CommandLine/Infrastructure/DefaultObjectFactory.cs new file mode 100644 index 00000000..c8392ca6 --- /dev/null +++ b/src/CommandLine/Infrastructure/DefaultObjectFactory.cs @@ -0,0 +1,22 @@ +using System; + +namespace CommandLine.Infrastructure +{ + /// + /// Default object factory to use with parser, defaults to Activator.CreateInstance() + /// + public class DefaultObjectFactory : IObjectFactory + { + /// + public T Resolve() + { + return Activator.CreateInstance(); + } + + /// + public object Resolve(Type type) + { + return Activator.CreateInstance(type); + } + } +} \ No newline at end of file diff --git a/src/CommandLine/Infrastructure/IObjectFactory.cs b/src/CommandLine/Infrastructure/IObjectFactory.cs new file mode 100644 index 00000000..00ebb6ce --- /dev/null +++ b/src/CommandLine/Infrastructure/IObjectFactory.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CommandLine.Infrastructure +{ + /// + /// + /// + public interface IObjectFactory + { + /// + /// Creates an instance of specified type "/> + /// + /// + T Resolve(); + /// + /// Creates an instance of specified type "/> + /// + /// /// + /// + object Resolve(Type type); + } +} diff --git a/src/CommandLine/Infrastructure/ObjectFactory.cs b/src/CommandLine/Infrastructure/ObjectFactory.cs deleted file mode 100644 index a232f71c..00000000 --- a/src/CommandLine/Infrastructure/ObjectFactory.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace CommandLine.Infrastructure -{ - /// - /// - /// - public interface IObjectFactory - { - /// - /// Creates and return a new instance of - /// - /// - T CreateInstance(); - } - - /// - /// Default object factory to use with parser, defaults to Activator.CreateInstance() - /// - public class DefaultObjectFactory : IObjectFactory - { - /// - /// Creates a new instance to be used by parser model creation/> - /// - /// - public T CreateInstance() - { - return Activator.CreateInstance(); - } - } -} diff --git a/src/CommandLine/Parser.cs b/src/CommandLine/Parser.cs index df3b415e..d5aa01e0 100644 --- a/src/CommandLine/Parser.cs +++ b/src/CommandLine/Parser.cs @@ -88,7 +88,7 @@ public ParserResult ParseArguments(IEnumerable args) if (args == null) throw new ArgumentNullException("args"); var factory = typeof(T).IsMutable() - ? Maybe.Just>(CreateInstance) + ? Maybe.Just>(ParserSettings.ObjectFactory.Resolve) : Maybe.Nothing>(); return MakeParserResult( @@ -103,16 +103,6 @@ public ParserResult ParseArguments(IEnumerable args) settings); } - /// - /// Create Instance to use for binding - /// Override to add container resolution - /// - /// - /// - protected virtual T CreateInstance() - { - return settings.DefaultObjectFactory.CreateInstance(); - } /// /// Parses a string array of command line arguments constructing values in an instance of type . diff --git a/src/CommandLine/ParserSettings.cs b/src/CommandLine/ParserSettings.cs index f591d8dc..8ea899a3 100644 --- a/src/CommandLine/ParserSettings.cs +++ b/src/CommandLine/ParserSettings.cs @@ -32,7 +32,7 @@ public ParserSettings() caseSensitive = true; caseInsensitiveEnumValues = false; parsingCulture = CultureInfo.InvariantCulture; - DefaultObjectFactory = new DefaultObjectFactory(); + try { maximumDisplayWidth = Console.WindowWidth; @@ -43,6 +43,11 @@ public ParserSettings() } } + /// + /// Object Factory to use for new instances + /// + public static IObjectFactory ObjectFactory { get; set; } = new DefaultObjectFactory(); + /// /// Finalizes an instance of the class. /// @@ -51,12 +56,7 @@ public ParserSettings() Dispose(false); } - - /// - /// Sets the default object factory to use for instance creation - /// - public IObjectFactory DefaultObjectFactory { get; set; } - + /// /// Gets or sets a value indicating whether perform case sensitive comparisons. /// Note that case insensitivity only applies to parameters, not the values From d47dd750ea2907049cfcac372bd802d004f8ef9e Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 14:09:23 -0400 Subject: [PATCH 04/12] updated version to correct format --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 01984685..789e5a70 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ init: build_script: - cmd: build.cmd test: off -version: 0.0.1.{build} +version: 2.1.3.{build}-beta artifacts: - path: bin name: bin From c41371f6d5641acaa8cbe763869691271868d142 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 14:12:18 -0400 Subject: [PATCH 05/12] ci updates --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 789e5a70..1947ddfb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,5 +5,6 @@ build_script: test: off version: 2.1.3.{build}-beta artifacts: - - path: bin - name: bin + - path: build + name: build + - path **/*.nupkg \ No newline at end of file From 794b41af87f8f461c1f710dbe3e9e68332c4d2ae Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 14:12:18 -0400 Subject: [PATCH 06/12] ci updates --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 789e5a70..607b3406 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,5 +5,7 @@ build_script: test: off version: 2.1.3.{build}-beta artifacts: - - path: bin - name: bin + - path: build + name: build + - path: ./src/**/*.nupkg + name: nuget From 5bba5e5d527e178a308618099284c65ef7b2c3ac Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 15:49:00 -0400 Subject: [PATCH 07/12] added netstandard20 build project --- .gitignore | 2 + build.cmd | 3 +- .../CommandLine.netstandard.csproj | 63 +++++++++++++++++++ src/CommandLine/Core/ReflectionExtensions.cs | 7 ++- .../Infrastructure/FSharpOptionHelper.cs | 9 ++- .../Infrastructure/ReflectionHelper.cs | 2 +- src/CommandLine/Text/HelpText.cs | 2 +- 7 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 src/CommandLine/CommandLine.netstandard.csproj diff --git a/.gitignore b/.gitignore index 2f2f78c8..b66be003 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ artifacts/* *.nuget.props *.DotSettings.user +*/build/* +build diff --git a/build.cmd b/build.cmd index b5a72cab..ee9126d5 100644 --- a/build.cmd +++ b/build.cmd @@ -15,4 +15,5 @@ if errorlevel 1 ( .\packages\FAKE\tools\Fake %* dotnet restore -dotnet build --configuration Release --output build\netstandard1.5 --framework netstandard1.5 src\commandline \ No newline at end of file +dotnet build --configuration Release --output .\build\netstandard1.5 --framework netstandard1.5 src\commandline +dotnet build --configuration Release --output .\build\netstandard2.0 --framework netstandard2.0 src\commandline\commandline.netstandard.csproj diff --git a/src/CommandLine/CommandLine.netstandard.csproj b/src/CommandLine/CommandLine.netstandard.csproj new file mode 100644 index 00000000..5eb0728b --- /dev/null +++ b/src/CommandLine/CommandLine.netstandard.csproj @@ -0,0 +1,63 @@ + + + + netstandard2.0 + true + CommandLine-NetStandard + gsscoder, clmcgrath + + CommandLine.netstandard20 + + 1.0.0.0 + false + + + + 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 + + + + 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 + + + + + + + + + + + + + + + + + + + + True + Infrastructure/ErrorHandling.cs + + + True + Infrastructure/EnumerableExtensions.cs + + + True + Infrastructure/Maybe.cs + + + + + + + + + + + + + + diff --git a/src/CommandLine/Core/ReflectionExtensions.cs b/src/CommandLine/Core/ReflectionExtensions.cs index 3b011316..5a3998b2 100644 --- a/src/CommandLine/Core/ReflectionExtensions.cs +++ b/src/CommandLine/Core/ReflectionExtensions.cs @@ -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 diff --git a/src/CommandLine/Infrastructure/FSharpOptionHelper.cs b/src/CommandLine/Infrastructure/FSharpOptionHelper.cs index 783cfa83..e38e15d5 100644 --- a/src/CommandLine/Infrastructure/FSharpOptionHelper.cs +++ b/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) diff --git a/src/CommandLine/Infrastructure/ReflectionHelper.cs b/src/CommandLine/Infrastructure/ReflectionHelper.cs index c054f83c..2ba63879 100644 --- a/src/CommandLine/Infrastructure/ReflectionHelper.cs +++ b/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 diff --git a/src/CommandLine/Text/HelpText.cs b/src/CommandLine/Text/HelpText.cs index eaa6ade5..1fda10ec 100644 --- a/src/CommandLine/Text/HelpText.cs +++ b/src/CommandLine/Text/HelpText.cs @@ -694,7 +694,7 @@ private static Maybe>> GetUsageFromTy var prop = tuple.Item1; var attr = tuple.Item2; -#if NETSTANDARD1_5 +#if NETSTANDARD1_5 || NETSTANDARD2_0 var examples = (IEnumerable)prop.GetValue(null); #else var examples = (IEnumerable)prop From aec7fee26b0d508d23f561249c989d79d7106329 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 15:54:08 -0400 Subject: [PATCH 08/12] changed appveyor image --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 607b3406..8ac14e02 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ init: - git config --global core.autocrlf input +image: Visual Studio 2017 Preview build_script: - cmd: build.cmd test: off From 0ebf9d0964adb64b0ceff3a5026f5a553b95f4d5 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 16:23:28 -0400 Subject: [PATCH 09/12] added netstandard restore to build.cmd --- build.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.cmd b/build.cmd index ee9126d5..ff7c86e1 100644 --- a/build.cmd +++ b/build.cmd @@ -16,4 +16,6 @@ if errorlevel 1 ( dotnet restore dotnet build --configuration Release --output .\build\netstandard1.5 --framework netstandard1.5 src\commandline + +dotnet restore .\src\CommandLine\CommandLine.netstandard.csproj dotnet build --configuration Release --output .\build\netstandard2.0 --framework netstandard2.0 src\commandline\commandline.netstandard.csproj From 467b35a73499114adac50cf1f32c880a4bf68be8 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Tue, 25 Jul 2017 17:08:56 -0400 Subject: [PATCH 10/12] add package version generation to build.cmd --- build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index ff7c86e1..39db539c 100644 --- a/build.cmd +++ b/build.cmd @@ -15,7 +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 +dotnet build --configuration Release --output .\build\netstandard2.0 --framework netstandard2.0 src\commandline\commandline.netstandard.csproj /p:PackageVersion=%APPVEYOR_BUILD_VERSION% From 410153afb013d020cbe5a5e5a974c4245ed1d6d5 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Fri, 3 Nov 2017 14:40:45 -0400 Subject: [PATCH 11/12] revert appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8ac14e02..607b3406 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,5 @@ init: - git config --global core.autocrlf input -image: Visual Studio 2017 Preview build_script: - cmd: build.cmd test: off From a7857c74f66642caeb7e9f0530bc15a508073d11 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Fri, 3 Nov 2017 15:17:34 -0400 Subject: [PATCH 12/12] revert appveyor.yml --- appveyor.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 607b3406..8e139384 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +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: 2.1.3.{build}-beta + artifacts: - - path: build - name: build - - path: ./src/**/*.nupkg - name: nuget +- path: build/*.nupkg + name: NugetPackage + +deploy: +- provider: NuGet + api_key: + secure: sQzzieUQGkTU0CvzXLcv5Wph6K7h3T+8teovqwa/Dzk1p9WhpmuUHiRxd3U0YhqO + artifact: 'NuGetPackage' + on: + branch: release \ No newline at end of file