Skip to content

Commit

Permalink
Merge pull request #2104 from fsharp/release/next
Browse files Browse the repository at this point in the history
Release 5.8
  • Loading branch information
matthid authored Sep 27, 2018
2 parents 2ee1519 + 56e6183 commit 16fa008
Show file tree
Hide file tree
Showing 32 changed files with 724 additions and 102 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ project.lock.json

#src/app/*/any

/fake-dotnetcore
/fake-dotnetcore*.zip
/testbuild.fsx
/testbuild.fsx.lock
/src/legacy/deploy.web/Fake.Deploy.Web/App_Data/Providers/**/*.dll
Expand Down
15 changes: 15 additions & 0 deletions Fake.sln
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Vault", "src\app\
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Installer.Squirrel", "src\app\Fake.Installer.Squirrel\Fake.Installer.Squirrel.fsproj", "{3DEF2E95-4BF8-413F-930E-32103A39364A}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Sql.SqlServer", "src\app\Fake.Sql.SqlServer\Fake.Sql.SqlServer.fsproj", "{2EEAD673-45BE-4836-90B4-CF545877ACB9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1070,6 +1072,18 @@ Global
{3DEF2E95-4BF8-413F-930E-32103A39364A}.Release|x64.Build.0 = Release|Any CPU
{3DEF2E95-4BF8-413F-930E-32103A39364A}.Release|x86.ActiveCfg = Release|Any CPU
{3DEF2E95-4BF8-413F-930E-32103A39364A}.Release|x86.Build.0 = Release|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Debug|x64.ActiveCfg = Debug|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Debug|x64.Build.0 = Debug|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Debug|x86.ActiveCfg = Debug|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Debug|x86.Build.0 = Debug|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Release|Any CPU.Build.0 = Release|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Release|x64.ActiveCfg = Release|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Release|x64.Build.0 = Release|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Release|x86.ActiveCfg = Release|Any CPU
{2EEAD673-45BE-4836-90B4-CF545877ACB9}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1151,6 +1165,7 @@ Global
{F1641150-B89D-40B7-A3BE-9DC357410FDA} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{AAAF92C5-C40D-40B8-84BA-137DF0E98B56} = {901F162F-8925-4390-89C5-9EE2C343F744}
{3DEF2E95-4BF8-413F-930E-32103A39364A} = {901F162F-8925-4390-89C5-9EE2C343F744}
{2EEAD673-45BE-4836-90B4-CF545877ACB9} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {058A0C5E-2216-4306-8AFB-0AE28320C26A}
Expand Down
9 changes: 9 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Release Notes

## 5.8.0 - 2018-09-27

* NEW: Fake.Sql.SqlServer module - https://github.com/fsharp/FAKE/pull/2074
* ENHANCEMENT: Some modules are now usable without FAKE context (ie. in your regular projects)
* ENHANCEMENT: Inform when the `target` environment variable is used - https://github.com/fsharp/FAKE/issues/2107
* BUGFIX: Environment variables are case insensitive on windows, fake will now throw exceptions if it detects invalid environment maps
* BUGFIX: MSBuild properties containing special characters lead to errors - https://github.com/fsharp/FAKE/issues/2112
* DOCS: Fix syntax errors in dacpac docs - https://github.com/fsharp/FAKE/pull/2115

## 5.7.2 - 2018-09-24

* ENHANCEMENT: TeamFoundation now reports errors as errors instead of warnings - https://github.com/fsharp/FAKE/pull/2103
Expand Down
8 changes: 4 additions & 4 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,20 +259,20 @@ let dotnetAssemblyInfos =
"Fake.DotNet.AssemblyInfoFile", "Writing AssemblyInfo files"
"Fake.DotNet.Cli", "Running the dotnet cli"
"Fake.DotNet.Fsc", "Running the f# compiler - fsc"
"Fake.DotNet.Fsi", "FSharp Interactive - fsi"
"Fake.DotNet.FSFormatting", "Running fsformatting.exe and generating documentation"
"Fake.DotNet.Fsi", "FSharp Interactive - fsi"
"Fake.DotNet.Mage", "Manifest Generation and Editing Tool"
"Fake.DotNet.MSBuild", "Running msbuild"
"Fake.DotNet.NuGet", "Running NuGet Client and interacting with NuGet Feeds"
"Fake.DotNet.Paket", "Running Paket and publishing packages"
"Fake.DotNet.Testing.DotCover", "Code coverage with DotCover"
"Fake.DotNet.Testing.Expecto", "Running expecto test runner"
"Fake.DotNet.Testing.MSpec", "Running mspec test runner"
"Fake.DotNet.Testing.MSTest", "Running mstest test runner"
"Fake.DotNet.Testing.VSTest", "Running vstest test runner"
"Fake.DotNet.Testing.NUnit", "Running nunit test runner"
"Fake.DotNet.Testing.OpenCover", "Code coverage with OpenCover"
"Fake.DotNet.Testing.DotCover", "Code coverage with DotCover"
"Fake.DotNet.Testing.SpecFlow", "BDD with Gherkin and SpecFlow"
"Fake.DotNet.Testing.VSTest", "Running vstest test runner"
"Fake.DotNet.Testing.XUnit2", "Running xunit test runner"
"Fake.DotNet.Xamarin", "Running Xamarin builds"
"Fake.Installer.InnoSetup", "Creating installers with InnoSetup"
Expand All @@ -286,6 +286,7 @@ let dotnetAssemblyInfos =
"Fake.netcore", "Command line tool"
"Fake.Runtime", "Core runtime features"
"Fake.Sql.DacPac", "Sql Server Data Tools DacPac operations"
"Fake.Sql.SqlServer", "Helpers around interacting with SQL Server databases"
"Fake.Testing.Common", "Common testing data types"
"Fake.Testing.ReportGenerator", "Convert XML coverage output to various formats"
"Fake.Testing.SonarQube", "Analyzing your project with SonarQube"
Expand Down Expand Up @@ -844,7 +845,6 @@ Target.create "DotNetCoreCreateDebianPackage" (fun _ ->
publish target
)


let rec nugetPush tries nugetpackage =
let ignore_conflict = Environment.environVar "IGNORE_CONFLICT" = "true"
try
Expand Down
3 changes: 3 additions & 0 deletions help/literate/templates/template-project.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ <h3 class="muted">{project-name}</h3>
<li>
<a href="dacpac.html">SQL DACPAC support</a>
</li>
<li>
<a href="sqlserver.html">SQL Server support</a>
</li>
<li>
<a href="fluentmigrator.html">FluentMigrator support</a>
</li>
Expand Down
1 change: 1 addition & 0 deletions help/markdown/help-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Here is the old sidebar:
* [Azure WebJobs support](azurewebjobs.html)
* [Azure Cloud Services support](azurecloudservices.html)
* [SQL DACPAC support](dacpac.html)
* [SQL Server support](sqlserver.html)
* [FluentMigrator support](fluentmigrator.html)
* [Android publisher](androidpublisher.html)
* [File Watcher](watch.html)
Expand Down
5 changes: 3 additions & 2 deletions help/markdown/sql-dacpac.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ Ensure that you have already built your database project (you can do this with s

/// the database for local development + compile
Target.create "DeployLocalDb" (fun _ ->
let connectionString = "Data Source=(localdb)\MSSQLLocalDB;Integrated Security=True;Database=MyDatabase;Pooling=False"
let connectionString = "Data Source=(localdb)\\MSSQLLocalDB;Integrated Security=True;Database=MyDatabase;Pooling=False"
let dacPacPath = "path/to/dbProject.dacpac"
DacPac.deployDb (fun args -> { args with Source = dacPacPath; Destination = localDbConnectionString }) |> ignore)
DacPac.deployDb (fun args -> { args with Source = dacPacPath; Destination = connectionString }) |> ignore
)

## Deployment Options

Expand Down
24 changes: 24 additions & 0 deletions help/markdown/sql-sqlserver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Interacting with SQL Server Databases

<div class="alert alert-info">
<h5>INFO</h5>
<p>This documentation is for FAKE version 5.0 or later. The old documentation can be found <a href="v4/fake-sql-sqlserver.html">here</a></p>
</div>

FAKE can be used to create, delete, and run scripts against a SQL Server database.

## Sample Usage

You need to have some edition of SQL Server installed on the machine running these tasks. Choose an edition from the [Microsoft SQL Server Downloads page](https://www.microsoft.com/en-us/sql-server/sql-server-downloads).

open Fake.Sql

Target.create "CreateIntegrationTestsDatabase" (fun _ ->
let connectionString = "Data Source=.;Initial Catalog=DATABASE_NAME;Integrated Security=True;"
SqlServer.dropAndCreateDatabase connectionString

let scripts = [ "path/to/create/tables.sql"; "path/to/seed/data.sql" ]
|> Seq.ofList

SqlServer.runScripts connectionString scripts
)
6 changes: 6 additions & 0 deletions help/templates/template.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@
<a href="/buildserver.html">BuildServer</a>
<ul>
<li><a href="/apidocs/v5/index.html#Fake.BuildServer">Api-Reference</a></li>
<li><a href="/apidocs/v5/fake-buildserver-appveyor.html">AppVeyor</a></li>
<li><a href="/apidocs/v5/fake-buildserver-teamfoundation.html">Azure DevOps</a></li>
<li><a href="/apidocs/v5/fake-buildserver-gitlab.html">GitLab</a></li>
<li><a href="/apidocs/v5/fake-buildserver-teamcity.html">TeamCity</a></li>
<li><a href="/apidocs/v5/fake-buildserver-travis.html">Travis</a></li>
</ul>
</li>
<li>
Expand Down Expand Up @@ -186,6 +191,7 @@
<a href="/apidocs/v5/index.html#Fake.Sql">Sql</a>
<ul>
<li><a href="/sql-dacpac.html">DacPac</a></li>
<li><a href="/sql-sqlserver.html">SQL Server</a></li>
</ul>
</li>
<li>
Expand Down
2 changes: 2 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,6 @@ group netcore
nuget System.IO.Compression.ZipFile
nuget System.Runtime.Loader
nuget System.IO.FileSystem.Watcher
nuget System.Data.SqlClient
nuget Microsoft.SqlServer.SqlManagementObjects

Loading

0 comments on commit 16fa008

Please sign in to comment.