Deprecate NET40

Author: forki

FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj

@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSharpx.Extras.Tests</RootNamespace>
     <AssemblyName>FSharpx.Extras.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
     <Name>FSharpx.Extras.Tests</Name>
     <TargetFrameworkProfile />

FSharpx.Extras.Tests/app.config

@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
-    
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
-  </dependentAssembly>
-</assemblyBinding></runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <Paket>True</Paket>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0" />
+        <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0" />
+        <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
 </configuration>

build.fsx

@@ -7,8 +7,7 @@ open Fake.ReleaseNotesHelper
 open System.IO
 
 
-// .NET Frameworks
-let net40 = "v4.0"
+let net45 = "v4.5"
 
 // directories
 let buildDir = "./bin"
@@ -36,7 +35,7 @@ let gitName = "FSharpx.Extras"
 System.Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 let release = parseReleaseNotes (File.ReadAllLines "RELEASE_NOTES.md")
 
-let fxVersions = [net40]
+let fxVersions = [net45]
 
 let normalizeFrameworkVersion fxVersion =
     let v = ("[^\\d]" >=> "") fxVersion
@@ -93,7 +92,7 @@ Target "Build" (fun _ ->
 
 Target "Test" (fun _ ->
     ActivateFinalTarget "CloseTestRunner"
-    for fxVersion in [net40] do
+    for fxVersion in [net45] do
       printfn "buildDirVer fxVersion = %s" (buildDirVer fxVersion)
       !! (buildDirVer fxVersion @@ "*.Tests.dll")
       |> NUnit (fun p ->

src/FSharpx.Extras/CSharpCompat.fs

@@ -9,7 +9,7 @@ open FSharpx.Collections
 open FSharpx.Functional
 open FSharpx.Control
 open FSharpx
-
+open Microsoft.FSharp.Control.WebExtensions
 
 [<assembly:Extension>]
 do()

src/FSharpx.Extras/FSharpx.Extras.fsproj

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSharpx</RootNamespace>
     <AssemblyName>FSharpx.Extras</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
     <Name>FSharpx.Extras</Name>
     <TargetFrameworkProfile>
@@ -59,7 +59,6 @@
     <Compile Include="Prelude.fs" />
     <Compile Include="Pluralizer.fs" />
     <Compile Include="Strings.fs" />
-    <Compile Include="JSON.fs" />
     <Compile Include="IO.fs" />
     <Compile Include="Monoid.fs" />
     <Compile Include="Linq\Linq.fsi" />

src/FSharpx.Extras/Iteratee.fs

@@ -5,7 +5,7 @@ open System
 open System.Collections
 open System.Collections.Generic
 open FSharpx.Collections
-open FSharp.Control
+open Microsoft.FSharp.Control
 
 (*
 # Iteratee