Core clr support.

.gitignore

@@ -1,6 +1,9 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+# dotnet cli
+project.lock.json
+
 # User-specific files
 *.suo
 *.user

appveyor.yml

@@ -1,3 +1,5 @@
+os: Visual Studio 2015
+
 configuration: Release
 test:
   assemblies:

build.fsx

@@ -171,6 +171,28 @@ Target "ReleaseGitHub" (fun _ ->
     |> Async.RunSynchronously
 )
 
+// .NET Core SDK and .NET Core
+
+let assertExitCodeZero x = if x = 0 then () else failwithf "Command failed with exit code %i" x
+
+Target "Build.NetCore" (fun _ ->
+    Shell.Exec("dotnet", "restore") |> assertExitCodeZero
+    Shell.Exec("dotnet", "--verbose pack --configuration Release", "src/Argu") |> assertExitCodeZero
+)
+
+Target "RunTests.NetCore" (fun _ ->
+    Shell.Exec("dotnet", "--verbose run --configuration Release", "tests/Argu.NetCore.Tests") |> assertExitCodeZero
+)
+
+let isDotnetSDKInstalled = try Shell.Exec("dotnet", "--version") = 0 with _ -> false
+
+Target "Nuget.AddNetCore" (fun _ ->
+    let nupkg = sprintf "../../bin/Argu.%s.nupkg" (release.NugetVersion)
+    let netcoreNupkg = sprintf "bin/Release/Argu.%s.nupkg" (release.NugetVersion)
+
+    Shell.Exec("dotnet", sprintf """mergenupkg --source "%s" --other "%s" --framework netstandard1.6 """ nupkg netcoreNupkg, "src/Argu/") |> assertExitCodeZero
+)
+
 
 Target "Release" DoNothing
 
@@ -191,7 +213,10 @@ Target "Default" DoNothing
 "Default"
   ==> "PrepareRelease"
   ==> "Build.Net35"
+  =?> ("Build.NetCore", isDotnetSDKInstalled)
+  =?> ("RunTests.NetCore", isDotnetSDKInstalled)
   ==> "NuGet"
+  =?> ("Nuget.AddNetCore", isDotnetSDKInstalled)
   ==> "GenerateDocs"
   ==> "ReleaseDocs"
   ==> "NuGetPush"

global.json

@@ -0,0 +1,3 @@
+{
+    "projects":[ "src", "tests" ]
+}

src/Argu/Argu.fsproj

@@ -11,6 +11,7 @@
     <AssemblyName>Argu</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Name>Argu</Name>
+    <ResolveNuGetPackages>false</ResolveNuGetPackages>
     <TargetFrameworkProfile />
     <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
   </PropertyGroup>

src/Argu/ArgumentParser.fs

@@ -153,7 +153,7 @@ and [<Sealed; NoEquality; NoComparison; AutoSerializable(false)>]
         let ignoreUnrecognized = defaultArg ignoreUnrecognized false
         let raiseOnUsage = defaultArg raiseOnUsage true
         let inputs = match inputs with None -> getEnvironmentCommandLineArgs () | Some args -> args
-        let configurationReader = match configurationReader with Some c -> c | None -> ConfigurationReader.FromAppSettings()
+        let configurationReader = match configurationReader with Some c -> c | None -> ConfigurationReader.DefaultReader()
 
         try
             let appSettingsResults = parseKeyValueConfig configurationReader argInfo
@@ -171,8 +171,13 @@ and [<Sealed; NoEquality; NoComparison; AutoSerializable(false)>]
     member __.ParseAppSettings (?xmlConfigurationFile : string, ?ignoreMissing : bool) : ParseResults<'Template> =
         let configurationReader =
             match xmlConfigurationFile with
-            | None -> ConfigurationReader.FromAppSettings()
-            | Some f -> ConfigurationReader.FromAppSettingsFile(f)
+            | None -> ConfigurationReader.DefaultReader()
+            | Some f ->
+#if CORE_CLR
+                raise <| NotImplementedException "App.Config is not supported."
+#else
+                ConfigurationReader.FromAppSettingsFile(f)
+#endif
 
         __.ParseConfiguration(configurationReader, ?ignoreMissing = ignoreMissing)
 
@@ -181,8 +186,12 @@ and [<Sealed; NoEquality; NoComparison; AutoSerializable(false)>]
     /// <param name="ignoreMissing">Ignore errors caused by the Mandatory attribute. Defaults to false.</param>
     [<Obsolete("Use ArgumentParser.ParseConfiguration method instead")>]
     member __.ParseAppSettings(assembly : Assembly, ?ignoreMissing : bool) =
+#if CORE_CLR
+        raise <| NotImplementedException "App.Config is not supported."
+#else
         let configurationReader = ConfigurationReader.FromAppSettings(assembly)
         __.ParseConfiguration(configurationReader, ?ignoreMissing = ignoreMissing)
+#endif
 
     /// <summary>
     ///     Converts a sequence of template argument inputs into a ParseResults instance

src/Argu/ConfigReaders.fs

@@ -3,6 +3,8 @@
 open System
 open System.IO
 open System.Collections.Generic
+
+#if !CORE_CLR
 open System.Configuration
 open System.Reflection
 
@@ -68,4 +70,14 @@ type ConfigurationReader =
 
     /// Create a configuration reader instance using an F# function
     static member FromFunction(reader : string -> string option, ?name : string) =
-        new FunctionConfigurationReader(reader, ?name = name) :> IConfigurationReader
+        new FunctionConfigurationReader(reader, ?name = name) :> IConfigurationReader
+
+    static member DefaultReader () = ConfigurationReader.FromAppSettings()
+#else
+/// Configuration reader implementations
+type ConfigurationReader =
+    static member DefaultReader () =
+        { new IConfigurationReader with
+            member x.Name = "Default - Empty Configuration Reader"
+            member x.GetValue k = null }
+#endif

src/Argu/PreCompute.fs

@@ -48,7 +48,11 @@ let tryExtractUnionParameterLabel (p : PropertyInfo) =
     else Some(p.Name.Replace('_',' '))
 
 let (|NestedParseResults|Optional|List|Other|) (t : Type) =
+#if CORE_CLR
+    if t.GetTypeInfo().IsGenericType then
+#else
     if t.IsGenericType then
+#endif
         let gt = t.GetGenericTypeDefinition()
         if typeof<IParseResult>.IsAssignableFrom t then NestedParseResults(t.GetGenericArguments().[0])
         elif gt = typedefof<_ option> then Optional(t.GetGenericArguments().[0])
@@ -95,7 +99,11 @@ let primitiveParsers =
 
 /// Creates a primitive parser from an enumeration
 let tryGetEnumerationParser label (t : Type) =
+#if CORE_CLR
+    if not (t.GetTypeInfo().IsEnum) then None else
+#else
     if not t.IsEnum then None else
+#endif
     let names = Enum.GetNames(t) |> Seq.map generateEnumName
     let values = Enum.GetValues(t) |> Seq.cast<obj>
     let index = Seq.zip names values |> Seq.toArray
@@ -211,7 +219,7 @@ let rec private preComputeUnionCaseArgInfo (stack : Type list) (helpParam : Help
     let fields = uci.GetFields()
     let types = fields |> Array.map (fun f -> f.PropertyType)
 
-    let caseCtor = FSharpValue.PreComputeUnionConstructor(uci, bindingFlags = allBindings)
+    let caseCtor = FSharpValue.PreComputeUnionConstructor(uci, allBindings)
 
     // create a dummy instance for given union case
     let dummyFields = types |> Array.map Unchecked.UntypedDefaultOf
@@ -386,7 +394,7 @@ let rec private preComputeUnionCaseArgInfo (stack : Type list) (helpParam : Help
             let tupleType = FSharpType.MakeTupleType types
             FSharpValue.PreComputeTupleConstructor tupleType)
 
-    let fieldReader = lazy(FSharpValue.PreComputeUnionReader(uci, bindingFlags = allBindings))
+    let fieldReader = lazy(FSharpValue.PreComputeUnionReader(uci, allBindings))
 
     let assignParser = lazy(
         match customAssignmentSeparator with
@@ -439,11 +447,15 @@ let rec private preComputeUnionCaseArgInfo (stack : Type list) (helpParam : Help
     uai
 
 and private preComputeUnionArgInfoInner (stack : Type list) (helpParam : HelpParam option) (tryGetParent : unit -> UnionCaseArgInfo option) (t : Type) : UnionArgInfo =
-    if not <| FSharpType.IsUnion(t, bindingFlags = allBindings) then
+    if not <| FSharpType.IsUnion(t, allBindings) then
         arguExn "template type '%O' is not an F# union." t
     elif stack |> List.exists ((=) t) then
         arguExn "template type '%O' implements unsupported recursive pattern." t
+#if CORE_CLR
+    elif t.GetTypeInfo().IsGenericType then
+#else
     elif t.IsGenericType then
+#endif
         arguExn "template type '%O' is generic; this is not supported." t
 
     let helpParam =
@@ -469,7 +481,7 @@ and private preComputeUnionArgInfoInner (stack : Type list) (helpParam : HelpPar
     let getCurrent = fun () -> !current
 
     let caseInfo =
-        FSharpType.GetUnionCases(t, bindingFlags = allBindings)
+        FSharpType.GetUnionCases(t, allBindings)
         |> Seq.map (preComputeUnionCaseArgInfo (t :: stack) (Some helpParam) getCurrent)
         |> Seq.sortBy (fun a -> a.Tag)
         |> Seq.toArray
@@ -511,7 +523,7 @@ and private preComputeUnionArgInfoInner (stack : Type list) (helpParam : HelpPar
             if not <| regex.IsMatch arg then [||] 
             else Array.init (arg.Length - 1) (fun i -> sprintf "-%c" arg.[i + 1]))
 
-    let tagReader = lazy(FSharpValue.PreComputeUnionTagReader(t, bindingFlags = allBindings))
+    let tagReader = lazy(FSharpValue.PreComputeUnionTagReader(t, allBindings))
 
     let cliIndex = lazy(
         caseInfo

src/Argu/UnionArgInfo.fs

@@ -3,7 +3,9 @@ module internal Argu.UnionArgInfo
 
 open System
 open System.IO
+#if !CORE_CLR
 open System.Configuration
+#endif
 open System.Collections.Generic
 open System.Reflection
 

src/Argu/Utils.fs

@@ -12,7 +12,11 @@ open FSharp.Reflection
 open FSharp.Quotations
 open FSharp.Quotations.Patterns
 
+#if NETSTANDARD1_6
+let allBindings = true
+#else
 let allBindings = BindingFlags.NonPublic ||| BindingFlags.Public ||| BindingFlags.Static ||| BindingFlags.Instance
+#endif
 
 let inline arguExn fmt = Printf.ksprintf(fun msg -> raise <| new ArguException(msg)) fmt
 
@@ -115,14 +119,24 @@ type Unchecked =
             }
 
 type MemberInfo with
-    member m.ContainsAttribute<'T when 'T :> Attribute> () =
-        m.GetCustomAttributes(typeof<'T>, true) |> Array.isEmpty |> not
+    member m.ContainsAttribute<'T when 'T :> Attribute> () : bool=
+        m.GetCustomAttributes(typeof<'T>, true) |> Seq.isEmpty |> not
 
-    member m.TryGetAttribute<'T when 'T :> Attribute> () =
-        match m.GetCustomAttributes(typeof<'T>, true) with
+    member m.TryGetAttribute<'T when 'T :> Attribute> () : 'T option =
+        match m.GetCustomAttributes(typeof<'T>, true) |> Seq.toArray with
         | [||] -> None
-        | attrs -> attrs |> Array.last |> unbox<'T> |> Some
+        | attrs -> attrs |> Array.last :?> 'T |> Some
+
+#if CORE_CLR
+type Type with
+    member x.GetCustomAttributes(t, b : bool) = x.GetTypeInfo().GetCustomAttributes(t, b)
+
+    member m.ContainsAttribute<'T when 'T :> Attribute> () : bool=
+        m.GetTypeInfo().ContainsAttribute<'T>()
 
+    member m.TryGetAttribute<'T when 'T :> Attribute> () : 'T option =
+        m.GetTypeInfo().TryGetAttribute<'T>()
+#endif
 
 type IDictionary<'K,'V> with
     member d.TryFind k =
@@ -131,19 +145,25 @@ type IDictionary<'K,'V> with
         else None
 
 
+#if !CORE_CLR
 let currentProgramName = lazy(System.Diagnostics.Process.GetCurrentProcess().MainModule.ModuleName)
+#else
+// error FS0039: The value, constructor, namespace or type 'Process' is not defined
+let currentProgramName = lazy("wtf")
+#endif
 
 type UnionCaseInfo with
     member uci.GetAttributes<'T when 'T :> Attribute> (?includeDeclaringTypeAttrs : bool) =
         let includeDeclaringTypeAttrs = defaultArg includeDeclaringTypeAttrs false
 
-        let caseAttrs = uci.GetCustomAttributes typeof<'T>
+        let caseAttrs = uci.GetCustomAttributes typeof<'T> |> Seq.cast<Attribute>
         let attrs =
             if includeDeclaringTypeAttrs then
                 uci.DeclaringType.GetCustomAttributes(typeof<'T>, false)
+                |> Seq.cast<Attribute>
                 |> Seq.append caseAttrs
             else
-                caseAttrs :> _
+                caseAttrs
 
         attrs |> Seq.map (fun o -> o :?> 'T)
 
@@ -152,7 +172,7 @@ type UnionCaseInfo with
 
         match uci.GetCustomAttributes typeof<'T> with
         | [||] when includeDeclaringTypeAttrs ->
-            match uci.DeclaringType.GetCustomAttributes(typeof<'T>, false) with
+            match uci.DeclaringType.GetCustomAttributes(typeof<'T>, false) |> Seq.toArray with
             | [||] -> None
             | attrs -> Some (attrs.[0] :?> 'T)
         | [||] -> None
@@ -162,7 +182,7 @@ type UnionCaseInfo with
         let includeDeclaringTypeAttrs = defaultArg includeDeclaringTypeAttrs false
         if uci.GetCustomAttributes typeof<'T> |> Array.isEmpty |> not then true
         elif includeDeclaringTypeAttrs then
-            uci.DeclaringType.GetCustomAttributes(typeof<'T>, false) |> Array.isEmpty |> not
+            uci.DeclaringType.GetCustomAttributes(typeof<'T>, false) |> Seq.isEmpty |> not
         else
             false
 

src/Argu/project.json

@@ -0,0 +1,49 @@
+{
+    "version": "3.1.0",
+    "buildOptions": {
+        "debugType": "portable",
+        "compilerName": "fsc",
+        "define": [
+            "CORE_CLR"
+        ],
+        "compile": {
+            "includeFiles": [
+                "AssemblyInfo.fs",
+                "Types.fs",
+                "Attributes.fs",
+                "Utils.fs",
+                "ConfigReaders.fs",
+                "UnionArgInfo.fs",
+                "PreCompute.fs",
+                "UnParsers.fs",
+                "ParseResults.fs",
+                "Parsers/Common.fs",
+                "Parsers/Cli.fs",
+                "Parsers/KeyValue.fs",
+                "ArgumentParser.fs"
+            ]
+        }
+    },
+    "tools": {
+        "dotnet-mergenupkg": "1.0.*",
+        "dotnet-compile-fsc": {
+            "version": "1.0.0-preview2-*",
+            "imports": "dnxcore50"
+        }
+    },
+    "frameworks": {
+        "netstandard1.6": {
+            "buildOptions": {
+                "define": [
+                    "NETSTANDARD1_5",
+                    "NETSTANDARD1_6"
+                ]
+            },
+            "dependencies": {
+                "System.Xml.XDocument": "4.0.11",
+                "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160629",
+                "NETStandard.Library": "1.6.0"
+            }
+        }
+    }
+}