Support for netstandard13 and netcoreapp

.gitignore

@@ -154,3 +154,6 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+/.vs/config/applicationhost.config
+/CSharpMonad/.vs/restore.dg
+*.lock.json

CSharpMonad/CSharpMonad.csproj

@@ -33,10 +33,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="src\EitherLazy.cs" />
     <Compile Include="src\ext\ImmutableListExt.cs" />

CSharpMonad/CSharpMonad.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharpMonad", "CSharpMonad.xproj", "{C0855756-19E8-4701-8980-4210040B5B5B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C0855756-19E8-4701-8980-4210040B5B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0855756-19E8-4701-8980-4210040B5B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0855756-19E8-4701-8980-4210040B5B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0855756-19E8-4701-8980-4210040B5B5B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

CSharpMonad/CSharpMonad.xproj

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>c0855756-19e8-4701-8980-4210040b5b5b</ProjectGuid>
+    <RootNamespace>CSharpMonad</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

CSharpMonad/Properties/AssemblyInfo.cs

@@ -1,7 +1,4 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Reflection;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -14,7 +11,6 @@
 [assembly: AssemblyCopyright("Copyright © Paul Louth 2014 - MIT License")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
 
 // Version information for an assembly consists of the following four values:
 //

CSharpMonad/project.json

@@ -1,7 +1,71 @@
 {
-  "supports": {},
-  "dependencies": {},
+  "id": "csharp-monad",
+  "title": "csharp-monad",
+  "version": "1.0.0-*",
+  "authors": [ "Paul Louth" ],
+  "description": "C# Monad Library",
+  "packOptions": {
+    "id": "csharp-monad",
+    "title": "C# Monad Library",
+    "owners": [ "paullouth" ],
+    "tags": [ "C#", "Functional", "Monad", "Option", "Either", "Reader", "Writer", "State" ],
+    "iconUrl": "https://camo.githubusercontent.com/08525ae465a9061150679d871731e77b399c2a94/687474703a2f2f7777772e34666f75722e6f72672f696d616765732f6c616e672d6578742d6c6f676f2e706e67",
+    "summary": "A C# library of monads and a full set of parser combinators based on the Haskell Parsec library.\nEither <L,R>\nEitherStrict <L,R>\nIO <T>\nOption <T>\nOptionStrict <T>\nParser <T>\nReader <E,T>\nRWS <R,W,S,T> - Combined Reader/Writer/State\nState <S,T>\nTry<T>\nWriter<W,T>",
+    "releaseNotes": "",
+    "projectUrl": "https://github.com/louthy/csharp-monad",
+    "licenseUrl": "https://github.com/louthy/csharp-monad/blob/master/LICENSE.md"
+  },
+  "copyright": "Copyright (c) Paul Louth",
+  "configurations": {
+    "Debug": {
+      "buildOptions": {
+        "define": [ "DEBUG", "TRACE" ],
+        "compile": "*.cs"
+      }
+    },
+    "Release": {
+      "buildOptions": {
+        "define": [ "RELEASE", "TRACE" ],
+        "optimize": true,
+        "compile": "*.cs"
+      }
+    }
+  },
+  "dependencies": {
+  },
   "frameworks": {
-    ".NETPortable,Version=v4.5,Profile=Profile7": {}
+    "net45": {
+      "frameworkAssemblies": {
+        "System.Core": "4.0.0.0"
+      },
+      "dependencies": {
+      }
+    },
+    "net46": {
+      "frameworkAssemblies": {
+        "System.Core": "4.0.0.0"
+      },
+      "dependencies": {
+      }
+    },
+    "netcoreapp10": {
+      "dependencies": {
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Collections": "4.0.11",
+        "System.Reflection": "4.1.0",
+        "System.Linq": "4.1.0"
+      }
+    },
+    "netstandard13": {
+      "dependencies": {
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Collections": "4.0.11",
+        "System.Reflection": "4.1.0",
+        "System.Linq": "4.1.0"
+      }
+    }
+  },
+  "buildOptions": {
+    "optimize": true
   }
 }

CSharpMonad/src/IAppendable.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace Monad
 {
     /// <summary>

CSharpMonad/src/IO.cs

@@ -26,8 +26,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/RWS.cs

@@ -25,8 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Monad.Utility;
 
 namespace Monad

CSharpMonad/src/Reader.cs

@@ -23,10 +23,6 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/Try.cs

@@ -25,10 +25,7 @@
 using Monad.Utility;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/Writer.cs

@@ -25,8 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Monad.Utility;
 
 namespace Monad

CSharpMonad/src/ext/EnumerableExt.cs

@@ -27,8 +27,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/ext/ImmutableListExt.cs

@@ -25,10 +25,6 @@
 using Monad.Parsec;
 using Monad.Utility;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/ext/LiftExt.cs

@@ -23,10 +23,6 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/ext/ObjectExt.cs

@@ -22,13 +22,8 @@
 // SOFTWARE.
 // 
 
-using Monad.Parsec;
 using Monad.Utility;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/ext/TupleExt.cs

@@ -23,10 +23,6 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/option-lazy/Just.cs

@@ -23,11 +23,7 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/option-lazy/Nothing.cs

@@ -23,10 +23,6 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/option-lazy/Option.cs

@@ -24,9 +24,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/option-strict/Just.cs

@@ -23,11 +23,7 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/option-strict/Nothing.cs

@@ -23,10 +23,6 @@
 // 
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/option-strict/OptionStrict.cs

@@ -24,9 +24,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Monad
 {

CSharpMonad/src/parsec/Empty.cs

@@ -24,9 +24,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Monad.Utility;
 
 namespace Monad.Parsec

CSharpMonad/src/parsec/Parser.cs

@@ -25,11 +25,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 using Monad.Utility;
-using System.Diagnostics;
 
 namespace Monad.Parsec
 {

CSharpMonad/src/parsec/ParserChar.cs

@@ -22,12 +22,6 @@
 // SOFTWARE.
 // 
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Monad.Parsec
 {
     public struct ParserChar

CSharpMonad/src/parsec/ParserExt.cs

@@ -25,8 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Monad.Utility;
 
 namespace Monad.Parsec

CSharpMonad/src/parsec/ParserResult.cs

@@ -24,9 +24,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Monad.Utility;
 
 namespace Monad.Parsec