Target .NET 4.5 & FSharp.Core 4.0

.gitignore

@@ -175,7 +175,6 @@ nuget/
 # Nuget outputs
 nuget/*.nupkg
 *.bak
-.paket/paket.exe
 paket-files
 build_PRIVATE.cmd
 .fake/build.fsx_*

FSharp.Configuration.nuspec

@@ -16,11 +16,10 @@
     <tags>@tags@</tags>
     <references>
         <reference file="FSharp.Configuration.dll" />
-        <reference file="SharpYaml.dll" />
     </references>
     <dependencies>
       <group>
-          <dependency id="FSharp.Core" version="[4.1.17,4.2)" />
+          <dependency id="FSharp.Core" version="4.0.0.1" />
       </group>
     </dependencies>
   </metadata>

RELEASE_NOTES.md

@@ -1,9 +1,14 @@
+#### 1.3.0 - 14.06.2017
+* Explicit dependency on FSharp.Core
+* Target .NET 4.5
+* Target FSharp.Core 4.0.0.1
+
 #### 1.2.0 - 20.05.2017
 * FSharp.Core 4.4.1.0
 
 #### 1.1.0 - 12.05.2017
 * Mono 5 support
- 
+
 #### 1.0.1 - 22.04.2017
 * NuGet package targets .NET 4.6
 
@@ -63,7 +68,7 @@
 * Add caching into all type providers
 
 #### 0.5.1 - 18.03.2015
-* fixed: YamlConfigProvider does not always parse floating point scalars 
+* fixed: YamlConfigProvider does not always parse floating point scalars
 
 #### 0.5.0 - 09.03.2015
 * YamlConfigProvider supports sequence of maps

build.cmd

@@ -1,14 +1,9 @@
 @echo off
 cls
 
-.paket\paket.bootstrapper.exe
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%
 )
 
-packages\FAKE\tools\FAKE.exe build.fsx %*
+packages\build\FAKE\tools\FAKE.exe build.fsx %*

build.fsx

@@ -2,9 +2,9 @@
 // FAKE build script
 // --------------------------------------------------------------------------------------
 
-#r @"packages/FAKE/tools/FakeLib.dll"
-#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx"
- 
+#r @"packages/build/FAKE/tools/FakeLib.dll"
+#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
+
 open Fake
 open Fake.Git
 open Fake.AssemblyInfoFile
@@ -13,7 +13,7 @@ open System
 open Octokit
 #if MONO
 #else
-#load "packages/SourceLink.Fake/tools/Fake.fsx"
+#load "packages/build/SourceLink.Fake/tools/Fake.fsx"
 open SourceLink
 #endif
 
@@ -55,7 +55,7 @@ let testAssemblies = "tests/**/bin/Release/*Tests*.exe"
 // The profile where the project is posted
 let gitOwner = "fsprojects"
 let gitHome = "https://github.com/" + gitOwner
-// The name of the project on GitHub 
+// The name of the project on GitHub
 let gitName = "FSharp.Configuration"
 
 // The url for the raw files hosted
@@ -163,12 +163,12 @@ Target "SourceLink" (fun _ ->
 
 Target "NuGet" (fun _ ->
     let nugetDocsDir = nugetDir @@ "docs"
-    let nugetlibDir = nugetDir @@ "lib/net46"
+    let nugetlibDir = nugetDir @@ "lib/net45"
 
     CleanDir nugetDocsDir
     CleanDir nugetlibDir
 
-    CopyDir nugetlibDir "bin" (fun file -> true)
+    CopyDir nugetlibDir "bin" (fun file -> file.Contains "FSharp.Core." |> not)
     CopyDir nugetDocsDir "./docs/output" allFiles
 
     NuGet (fun p ->
@@ -190,7 +190,7 @@ Target "NuGet" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Generate the documentation
 
-let fakePath = "packages" @@ "FAKE" @@ "tools" @@ "FAKE.exe"
+let fakePath = "packages" @@ "build" @@ "FAKE" @@ "tools" @@ "FAKE.exe"
 let fakeStartInfo script workingDirectory args fsiargs environmentVars =
     (fun (info: System.Diagnostics.ProcessStartInfo) ->
         info.FileName <- System.IO.Path.GetFullPath fakePath

build.sh

@@ -1,15 +1,9 @@
 #!/bin/bash
 
-mono .paket/paket.bootstrapper.exe
-exit_code=$?
-if [ $exit_code -ne 0 ]; then
-	exit $exit_code
-fi
-
 mono .paket/paket.exe restore
 exit_code=$?
 if [ $exit_code -ne 0 ]; then
 	exit $exit_code
 fi
 
-mono packages/FAKE/tools/FAKE.exe build.fsx $@
+mono packages/build/FAKE/tools/FAKE.exe build.fsx $@

docs/content/release-notes.md

@@ -1,9 +1,14 @@
+#### 1.3.0 - 14.06.2017
+* Explicit dependency on FSharp.Core
+* Target .NET 4.5
+* Target FSharp.Core 4.0.0.1
+
 #### 1.2.0 - 20.05.2017
 * FSharp.Core 4.4.1.0
 
 #### 1.1.0 - 12.05.2017
 * Mono 5 support
- 
+
 #### 1.0.1 - 22.04.2017
 * NuGet package targets .NET 4.6
 
@@ -63,7 +68,7 @@
 * Add caching into all type providers
 
 #### 0.5.1 - 18.03.2015
-* fixed: YamlConfigProvider does not always parse floating point scalars 
+* fixed: YamlConfigProvider does not always parse floating point scalars
 
 #### 0.5.0 - 09.03.2015
 * YamlConfigProvider supports sequence of maps

docs/tools/generate.fsx

@@ -22,23 +22,17 @@ let info =
 // For typical project, no changes are needed below
 // --------------------------------------------------------------------------------------
 
-#I "../../packages/FSharp.Formatting/lib/net40"
-#I "../../packages/FSharp.Compiler.Service/lib/net40"
-#I "../../packages/FSharpVSPowerTools.Core/lib/net45"
-#r "../../packages/FAKE/tools/NuGet.Core.dll"
-#r "../../packages/FAKE/tools/FakeLib.dll"
-#r "RazorEngine.dll"
-#r "System.Web.Razor.dll"
-#r "FSharp.Literate.dll"
-#r "FSharp.CodeFormat.dll"
-#r "FSharp.MetadataFormat.dll"
-#r "FSharpVSPowerTools.Core.dll"
+#I "../../packages/build/FAKE/tools/"
+#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
+#r "NuGet.Core.dll"
+#r "FakeLib.dll"
 open Fake
 open System.IO
 open Fake.FileHelper
 open FSharp.Literate
 open FSharp.MetadataFormat
 
+
 // When called from 'build.fsx', use the public project URL as <root>
 // otherwise, use the current 'output' directory.
 #if RELEASE
@@ -53,7 +47,7 @@ let content    = __SOURCE_DIRECTORY__ @@ "../content"
 let output     = __SOURCE_DIRECTORY__ @@ "../output"
 let files      = __SOURCE_DIRECTORY__ @@ "../files"
 let templates  = __SOURCE_DIRECTORY__ @@ "templates"
-let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
+let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/"
 let docTemplate = formatting @@ "templates/docpage.cshtml"
 
 // Where to look for *.csproj templates (in this order)
@@ -65,7 +59,7 @@ let layoutRoots =
 let copyFiles () =
   CopyRecursive files output true |> Log "Copying file: "
   ensureDirectory (output @@ "content")
-  CopyRecursive (formatting @@ "styles") (output @@ "content") true 
+  CopyRecursive (formatting @@ "styles") (output @@ "content") true
     |> Log "Copying styles and scripts: "
 
 // When called from 'build.fsx', use the public project URL as <root>
@@ -81,7 +75,7 @@ let buildReference () =
   CleanDir (output @@ "reference")
   for lib in referenceBinaries do
     MetadataFormat.Generate
-      ( bin @@ lib, output @@ "reference", layoutRoots, 
+      ( bin @@ lib, output @@ "reference", layoutRoots,
         parameters = ("root", refRoot)::info,
         sourceRepo = githubLink @@ "tree/master",
         sourceFolder = __SOURCE_DIRECTORY__ @@ ".." @@ "..",

paket.dependencies

@@ -1,13 +1,25 @@
 source http://nuget.org/api/v2
-framework net46
-
-nuget FAKE
-nuget FSharp.Formatting
-nuget Expecto
-nuget Octokit
-nuget SourceLink.Fake
-nuget NuGet.CommandLine
+framework: >= net45
+
 nuget SharpYaml
-nuget FSharp.Core
+nuget FSharp.Core ~> 4.0.0
+
+
+group Build
+    framework: net45
+    source https://nuget.org/api/v2
+
+    nuget FAKE
+    nuget FSharp.Formatting
+    nuget Octokit
+    nuget NuGet.CommandLine
+    nuget SourceLink.Fake
+
+    github fsharp/FAKE modules/Octokit/Octokit.fsx
+
+group Test
+    framework: net461
+    source https://nuget.org/api/v2
 
-github fsharp/FAKE modules/Octokit/Octokit.fsx
+    nuget FSharp.Core redirects: force
+    nuget Expecto

paket.lock

@@ -1,27 +1,35 @@
-FRAMEWORK: NET46
+FRAMEWORK: >= NET45
 NUGET
   remote: http://www.nuget.org/api/v2
-    Argu (3.7)
-    Expecto (4.1.1)
-      Argu (>= 3.7)
-      FSharp.Core (>= 3.1.2.5)
-      Mono.Cecil (>= 0.9.6.4)
-    FAKE (4.61.2)
+    FSharp.Core (4.0.0.1)
+    SharpYaml (1.6.1)
+
+GROUP Build
+FRAMEWORK: NET45
+NUGET
+  remote: https://www.nuget.org/api/v2
+    FAKE (4.61.3)
     FSharp.Compiler.Service (2.0.0.6)
-    FSharp.Core (4.1.17)
-      System.ValueTuple (>= 4.3)
     FSharp.Formatting (2.14.4)
       FSharp.Compiler.Service (2.0.0.6)
       FSharpVSPowerTools.Core (>= 2.3 < 2.4)
     FSharpVSPowerTools.Core (2.3)
       FSharp.Compiler.Service (>= 2.0.0.3)
-    Mono.Cecil (0.9.6.4)
-    NuGet.CommandLine (3.5)
+    NuGet.CommandLine (4.1)
     Octokit (0.24)
-    SharpYaml (1.6.1)
     SourceLink.Fake (1.1)
-    System.ValueTuple (4.3.1)
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (1ada6a9c84aada940bd7e6a7b63c0dc62e2fa56e)
-      Octokit (>= 0.20)
+    modules/Octokit/Octokit.fsx (574f6259c4abec2ae45b8c888aa1bdc9b5d4e842)
+      Octokit (>= 0.20)
+GROUP Test
+FRAMEWORK: NET461
+NUGET
+  remote: https://www.nuget.org/api/v2
+    Argu (3.7)
+    Expecto (4.2.1)
+      Argu (>= 3.7)
+      FSharp.Core (>= 4.1.12)
+      Mono.Cecil (>= 0.9.6.4)
+    FSharp.Core (4.2.1) - redirects: force
+    Mono.Cecil (0.9.6.4)

src/FSharp.Configuration/AssemblyInfo.fs

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Configuration")>]
 [<assembly: AssemblyProductAttribute("FSharp.Configuration")>]
 [<assembly: AssemblyDescriptionAttribute("The FSharp.Configuration project contains type providers for the configuration of .NET projects.")>]
-[<assembly: AssemblyVersionAttribute("1.2.0")>]
-[<assembly: AssemblyFileVersionAttribute("1.2.0")>]
+[<assembly: AssemblyVersionAttribute("1.3.0")>]
+[<assembly: AssemblyFileVersionAttribute("1.3.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Configuration"
     let [<Literal>] AssemblyProduct = "FSharp.Configuration"
     let [<Literal>] AssemblyDescription = "The FSharp.Configuration project contains type providers for the configuration of .NET projects."
-    let [<Literal>] AssemblyVersion = "1.2.0"
-    let [<Literal>] AssemblyFileVersion = "1.2.0"
+    let [<Literal>] AssemblyVersion = "1.3.0"
+    let [<Literal>] AssemblyFileVersion = "1.3.0"

src/FSharp.Configuration/FSharp.Configuration.fsproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSharp.Configuration</RootNamespace>
     <AssemblyName>FSharp.Configuration</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Name>FSharp.Configuration</Name>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -76,26 +75,26 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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\net45\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(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="SharpYaml">
           <HintPath>..\..\packages\SharpYaml\lib\net45\SharpYaml.dll</HintPath>
@@ -105,15 +104,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
-      <ItemGroup>
-        <Reference Include="System.ValueTuple">
-          <HintPath>..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
 </Project>