Merge branch 'fake-update' into net-standard

Author: Thorium

RELEASE_NOTES.md

@@ -1,3 +1,14 @@
+### 1.1.88 - 31.05.2020
+* Caching improvements
+* Possibility to group full entities over multiple keys
+
+### 1.1.87 - 20.05.2020
+* Fixed issue on multiple different same column group-by calculations
+
+### 1.1.86 - 05.05.2020
+* Design Time Command methods to properties for easier usability.
+* Fix for insert and update of SQLServer spatial data types #157
+
 ### 1.1.85 - 01.05.2020
 * Moved SaveContextSchema under Design Time Commands -property
 * Added ClearDatabaseSchemaCache under Design Time Commands -property

build.cmd

@@ -11,4 +11,4 @@ if errorlevel 1 (
   exit /b %errorlevel%
 )
 
-packages\FAKE\tools\FAKE.exe build.fsx %*
+packages\Build\FAKE\tools\FAKE.exe build.fsx %*

build.fsx

@@ -2,7 +2,8 @@
 // FAKE build script
 // --------------------------------------------------------------------------------------
 
-#r @"packages/FAKE/tools/FakeLib.dll"
+#r @"packages/Build/FAKE/tools/FakeLib.dll"
+
 open Fake
 open Fake.Git
 open Fake.AssemblyInfoFile
@@ -12,7 +13,7 @@ open System.IO
 
 #if MONO
 #else
-#load @"packages/SourceLink.Fake/tools/SourceLink.fsx"
+#load @"packages/Build/SourceLink.Fake/tools/SourceLink.fsx"
 #endif
 
 #r @"packages/scripts/Npgsql/lib/net451/Npgsql.dll"
@@ -307,21 +308,32 @@ Target "PackNuGet" (fun _ ->
 // Generate the documentation
 
 Target "GenerateReferenceDocs" (fun _ ->
-    if not <| executeFSIWithArgs "docs/tools" "generate.fsx" ["--define:RELEASE"; "--define:REFERENCE"] [] then
-      failwith "generating reference documentation failed"
+
+    //let result =
+        Fake.DotNetCli.RunCommand
+            (fun p -> { p with WorkingDir = __SOURCE_DIRECTORY__ @@ "docs" @@ "tools" })
+            "fsi --define:RELEASE --define:REFERENCE --exec generate.fsx"
+    //if not result.OK then failwith "generating reference documentation failed"
+
+    //if not <| executeFSIWithArgs "docs/tools" "generate.fsx" ["--define:RELEASE"; "--define:REFERENCE"] [] then
+    //  failwith "generating reference documentation failed"
 )
 
 let generateHelp' fail debug =
     let args =
-        if debug then ["--define:HELP"]
-        else ["--define:RELEASE"; "--define:HELP"]
-    if executeFSIWithArgs "docs/tools" "generate.fsx" args [] then
-        traceImportant "Help generated"
-    else
-        if fail then
-            failwith "generating help documentation failed"
-        else
-            traceImportant "generating help documentation failed"
+        if debug then "--define:HELP"
+        else "--define:RELEASE --define:HELP"
+    //let result =
+    Fake.DotNetCli.RunCommand
+        (fun p -> { p with WorkingDir = __SOURCE_DIRECTORY__ @@ "docs" @@ "tools" })
+        ("fsi " + args + "  --exec generate.fsx")
+    //if result.OK then
+    //    traceImportant "Help generated"
+    //else
+    //    if fail then
+    //        failwith "generating help documentation failed"
+    //    else
+    //        traceImportant "generating help documentation failed"
 
 let generateHelp fail =
     generateHelp' fail false

build.sh

@@ -15,7 +15,7 @@ then
   	exit $exit_code
   fi
 
-  packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
+  packages/Build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
 else
   # use mono
   mono .paket/paket.bootstrapper.exe
@@ -29,5 +29,5 @@ else
   if [ $exit_code -ne 0 ]; then
   	exit $exit_code
   fi
-  mono packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
+  mono packages/Build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx 
 fi

docs/tools/generate.fsx

@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------
 // Builds the documentation from `.fsx` and `.md` files in the 'docs/content' directory
 // (the generated documentation is stored in the 'docs/output' directory)
 // --------------------------------------------------------------------------------------
@@ -22,22 +22,23 @@ let info =
 // For typical project, no changes are needed below
 // --------------------------------------------------------------------------------------
 
-#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx"
-#r "../../packages/FAKE/tools/NuGet.Core.dll"
-#r "../../packages/FAKE/tools/FakeLib.dll"
+#load "../../packages/Build/FSharp.Formatting/FSharp.Formatting.fsx"
+#r "../../packages/Build/FAKE/tools/NuGet.Core.dll"
+#r "../../packages/Build/FAKE/tools/FakeLib.dll"
 open Fake
 open System.IO
 open Fake.FileHelper
 open FSharp.Literate
 open FSharp.MetadataFormat
+open FSharp.Formatting.Razor
 
 // Paths with template/source/output locations
 let bin        = __SOURCE_DIRECTORY__ @@ "../../bin/net451"
 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)
@@ -53,25 +54,33 @@ subDirectories (directoryInfo templates)
                                    formatting @@ "templates"
                                    formatting @@ "templates/reference" ]))
 
+let rec copyFilesRecursively (source: DirectoryInfo) (target: DirectoryInfo) (overwrite:bool) =
+    source.GetDirectories()
+    |> Seq.iter (fun dir -> copyFilesRecursively dir (target.CreateSubdirectory dir.Name) overwrite)
+    source.GetFiles()
+    |> Seq.map (fun file -> 
+        file.CopyTo(target.FullName @@ file.Name, overwrite) |> ignore
+        file.Name)
+    |> Log "Copying file: "
+
 // Copy static files and CSS + JS from F# Formatting
 let copyFiles () =
-  CopyRecursive files output true |> Log "Copying file: "
+  copyFilesRecursively (DirectoryInfo files) (DirectoryInfo output) true
   ensureDirectory (output @@ "content")
-  CopyRecursive (formatting @@ "styles") (output @@ "content") true 
-    |> Log "Copying styles and scripts: "
+  copyFilesRecursively (DirectoryInfo (formatting @@ "styles")) (DirectoryInfo(output @@ "content")) true
 
 // Build API reference from XML comments
 let buildReference () =
   CleanDir (output @@ "reference")
   let binaries =
     referenceBinaries
     |> List.map (fun lib-> bin @@ lib)
-  MetadataFormat.Generate
-    ( binaries, output @@ "reference", layoutRootsAll.["en"],
-      parameters = ("root", "../")::info,
-      sourceRepo = githubLink @@ "tree/master",
-      sourceFolder = __SOURCE_DIRECTORY__ @@ ".." @@ "..",
-      publicOnly = true, libDirs = [bin] )
+  RazorMetadataFormat.Generate
+        ( binaries, output @@ "reference", layoutRootsAll.["en"],
+            parameters = ("root", "../")::info,
+            sourceRepo = githubLink @@ "tree/master",
+            sourceFolder = __SOURCE_DIRECTORY__ @@ ".." @@ "..",
+            publicOnly = true, libDirs = [bin] )
 
 // Build documentation from `fsx` and `md` files in `docs/content`
 let buildDocumentation () =
@@ -95,7 +104,8 @@ let buildDocumentation () =
         match key with
         | Some lang -> layoutRootsAll.[lang]
         | None -> layoutRootsAll.["en"] // "en" is the default language
-    Literate.ProcessDirectory
+    printfn "Generating helps..."
+    RazorLiterate.ProcessDirectory
       ( dir, docTemplate, output @@ sub,
         processRecursive = false,
         replacements = ("root", getRelativePath content dir dir)::info,
@@ -109,4 +119,4 @@ buildDocumentation()
 #endif
 #if REFERENCE
 buildReference()
-#endif
+#endif

paket.dependencies

@@ -1,16 +1,21 @@
 source https://nuget.org/api/v2
 
 nuget FSharp.Compiler.Tools
-nuget Nuget.CommandLine
-nuget FAKE
-nuget FSharp.Formatting >= 3.0.0-beta01
 nuget FSharp.Core >= 3.1.2.5 lowest_matching:true, redirects:force
 nuget RazorEngine
 nuget NUnit = 2.6.4
 nuget NUnit.Runners = 2.6.4
-nuget SourceLink.Fake
 nuget System.Data.SqlClient
 
+group Build
+    source https://nuget.org/api/v2
+
+    nuget FSharp.Core
+    nuget FSharp.Formatting >= 4.0.0
+    nuget FAKE < 5.0.0
+    nuget SourceLink.Fake
+    nuget Nuget.CommandLine
+
 group Standard
     source https://nuget.org/api/v2
 
@@ -27,8 +32,7 @@ group Standard
     nuget System.Data.SqlClient
     nuget System.Data.Common
     nuget System.Data.Odbc
-	nuget Microsoft.Data.SQLite
-	nuget FSharp.Compiler.Service
+	nuget Microsoft.Data.SQLite 2.0
 
 github fsharp/FAKE modules/Octokit/Octokit.fsx
 
@@ -43,13 +47,13 @@ group Scripts
     source https://nuget.org/api/v2
 
     nuget MySql.Data < 7.0.0
-    nuget MySqlConnector
+    nuget MySqlConnector 0.36.1
     nuget Newtonsoft.Json
-    nuget Npgsql
-    nuget Oracle.ManagedDataAccess
-    nuget FirebirdSql.Data.FirebirdClient
-    nuget System.Data.SQLite.Core
-    nuget System.Data.SQLite.Linq
+    nuget Npgsql < 4.0
+    nuget Oracle.ManagedDataAccess 12.2.1100
+    nuget FirebirdSql.Data.FirebirdClient 5.12.1
+    nuget System.Data.SQLite.Core 1.0.105.2
+    nuget System.Data.SQLite.Linq 1.0.105.2
     // nuget Microsoft.Data.Sqlite.Core.Backport // Needed if we want currently Core support on Linux.