diff --git a/Fake.sln b/Fake.sln
index c4e2bdd6460..e4950d35588 100644
--- a/Fake.sln
+++ b/Fake.sln
@@ -4,134 +4,136 @@ VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{7BFFAE76-DEE9-417A-A79B-6A6644C4553A}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Context", "src/app/Fake.Core.Context/Fake.Core.Context.fsproj", "{D3D92ED7-C2B9-46D5-B611-A2CF0C30C8DB}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Context", "src\app\Fake.Core.Context\Fake.Core.Context.fsproj", "{D3D92ED7-C2B9-46D5-B611-A2CF0C30C8DB}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Environment", "src/app/Fake.Core.Environment/Fake.Core.Environment.fsproj", "{A2C4A85F-24C4-4FFA-B165-4807B1127C4E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Environment", "src\app\Fake.Core.Environment\Fake.Core.Environment.fsproj", "{A2C4A85F-24C4-4FFA-B165-4807B1127C4E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Process", "src/app/Fake.Core.Process/Fake.Core.Process.fsproj", "{DB09FF66-8750-40B8-9E25-70FADD9CF0BD}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Process", "src\app\Fake.Core.Process\Fake.Core.Process.fsproj", "{DB09FF66-8750-40B8-9E25-70FADD9CF0BD}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.ReleaseNotes", "src/app/Fake.Core.ReleaseNotes/Fake.Core.ReleaseNotes.fsproj", "{FEDE1F15-C0A5-4DA1-B20D-0A0C28F6858E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.ReleaseNotes", "src\app\Fake.Core.ReleaseNotes\Fake.Core.ReleaseNotes.fsproj", "{FEDE1F15-C0A5-4DA1-B20D-0A0C28F6858E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.SemVer", "src/app/Fake.Core.SemVer/Fake.Core.SemVer.fsproj", "{AFCCC2AB-EFFE-4CAE-ACAD-3434B04D3A4E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.SemVer", "src\app\Fake.Core.SemVer\Fake.Core.SemVer.fsproj", "{AFCCC2AB-EFFE-4CAE-ACAD-3434B04D3A4E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.String", "src/app/Fake.Core.String/Fake.Core.String.fsproj", "{D5B2FEB2-BA3A-492D-B83D-414835043D86}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.String", "src\app\Fake.Core.String\Fake.Core.String.fsproj", "{D5B2FEB2-BA3A-492D-B83D-414835043D86}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Trace", "src/app/Fake.Core.Trace/Fake.Core.Trace.fsproj", "{9430365D-C956-4290-A006-A87F9083DC4B}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Trace", "src\app\Fake.Core.Trace\Fake.Core.Trace.fsproj", "{9430365D-C956-4290-A006-A87F9083DC4B}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Target", "src/app/Fake.Core.Target/Fake.Core.Target.fsproj", "{0C28F2FB-2B12-4893-AAA4-2C2548926847}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Target", "src\app\Fake.Core.Target\Fake.Core.Target.fsproj", "{0C28F2FB-2B12-4893-AAA4-2C2548926847}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Tasks", "src/app/Fake.Core.Tasks/Fake.Core.Tasks.fsproj", "{83860B89-4A95-49A5-B4D6-B8F3345498E9}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Tasks", "src\app\Fake.Core.Tasks\Fake.Core.Tasks.fsproj", "{83860B89-4A95-49A5-B4D6-B8F3345498E9}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Xml", "src/app/Fake.Core.Xml/Fake.Core.Xml.fsproj", "{C3C12DCE-7AC4-4E97-A7FC-49189D218885}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.Xml", "src\app\Fake.Core.Xml\Fake.Core.Xml.fsproj", "{C3C12DCE-7AC4-4E97-A7FC-49189D218885}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.AssemblyInfoFile", "src/app/Fake.DotNet.AssemblyInfoFile/Fake.DotNet.AssemblyInfoFile.fsproj", "{BB293F2E-C3BD-4F1C-8345-8AEF01998D2C}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.AssemblyInfoFile", "src\app\Fake.DotNet.AssemblyInfoFile\Fake.DotNet.AssemblyInfoFile.fsproj", "{BB293F2E-C3BD-4F1C-8345-8AEF01998D2C}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Cli", "src/app/Fake.DotNet.Cli/Fake.DotNet.Cli.fsproj", "{B2C0063A-FC66-4883-BB69-B1DBE6BF9CA2}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Cli", "src\app\Fake.DotNet.Cli\Fake.DotNet.Cli.fsproj", "{B2C0063A-FC66-4883-BB69-B1DBE6BF9CA2}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.MSBuild", "src/app/Fake.DotNet.MSBuild/Fake.DotNet.MSBuild.fsproj", "{64195C50-E138-4218-A7CE-13CD4565B87E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.MSBuild", "src\app\Fake.DotNet.MSBuild\Fake.DotNet.MSBuild.fsproj", "{64195C50-E138-4218-A7CE-13CD4565B87E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.NuGet", "src/app/Fake.DotNet.NuGet/Fake.DotNet.NuGet.fsproj", "{93F1A71E-54E2-4C65-BB1E-1D499890317F}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.NuGet", "src\app\Fake.DotNet.NuGet\Fake.DotNet.NuGet.fsproj", "{93F1A71E-54E2-4C65-BB1E-1D499890317F}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.Expecto", "src/app/Fake.DotNet.Testing.Expecto/Fake.DotNet.Testing.Expecto.fsproj", "{819E2756-7BEE-4FCD-BA08-7BF323405CBE}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.Expecto", "src\app\Fake.DotNet.Testing.Expecto\Fake.DotNet.Testing.Expecto.fsproj", "{819E2756-7BEE-4FCD-BA08-7BF323405CBE}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.MSpec", "src/app/Fake.DotNet.Testing.MSpec/Fake.DotNet.Testing.MSpec.fsproj", "{C1B87E1F-8D0D-4A78-9A24-9D5D38B7E9A8}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.MSpec", "src\app\Fake.DotNet.Testing.MSpec\Fake.DotNet.Testing.MSpec.fsproj", "{C1B87E1F-8D0D-4A78-9A24-9D5D38B7E9A8}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.NUnit", "src/app/Fake.DotNet.Testing.NUnit/Fake.DotNet.Testing.NUnit.fsproj", "{75C9DD21-B4EA-4117-BF4F-AFE777A80B5B}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.NUnit", "src\app\Fake.DotNet.Testing.NUnit\Fake.DotNet.Testing.NUnit.fsproj", "{75C9DD21-B4EA-4117-BF4F-AFE777A80B5B}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.XUnit2", "src/app/Fake.DotNet.Testing.XUnit2/Fake.DotNet.Testing.XUnit2.fsproj", "{21E2FE31-4E7C-489E-8215-9303108A2F39}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.XUnit2", "src\app\Fake.DotNet.Testing.XUnit2\Fake.DotNet.Testing.XUnit2.fsproj", "{21E2FE31-4E7C-489E-8215-9303108A2F39}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.MSTest", "src/app/Fake.DotNet.Testing.MSTest/Fake.DotNet.Testing.MSTest.fsproj", "{21E2FE31-4E7C-489E-8215-9303108A2F30}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.MSTest", "src\app\Fake.DotNet.Testing.MSTest\Fake.DotNet.Testing.MSTest.fsproj", "{21E2FE31-4E7C-489E-8215-9303108A2F30}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.IO.FileSystem", "src/app/Fake.IO.FileSystem/Fake.IO.FileSystem.fsproj", "{4B1416CD-C7CB-4670-8EFE-871ED316D51D}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.IO.FileSystem", "src\app\Fake.IO.FileSystem\Fake.IO.FileSystem.fsproj", "{4B1416CD-C7CB-4670-8EFE-871ED316D51D}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.IO.Zip", "src/app/Fake.IO.Zip/Fake.IO.Zip.fsproj", "{46ED6A9C-C5BF-4495-924E-478736FC280E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.IO.Zip", "src\app\Fake.IO.Zip\Fake.IO.Zip.fsproj", "{46ED6A9C-C5BF-4495-924E-478736FC280E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.JavaScript.Npm", "src/app/Fake.JavaScript.Npm/Fake.JavaScript.Npm.fsproj", "{D2B2F400-C74C-442F-A1DA-4DD89A1C61B7}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.JavaScript.Npm", "src\app\Fake.JavaScript.Npm\Fake.JavaScript.Npm.fsproj", "{D2B2F400-C74C-442F-A1DA-4DD89A1C61B7}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Runtime", "src/app/Fake.Runtime/Fake.Runtime.fsproj", "{44A3F022-D70A-422D-B850-824BB572F2AF}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Runtime", "src\app\Fake.Runtime\Fake.Runtime.fsproj", "{44A3F022-D70A-422D-B850-824BB572F2AF}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.Common", "src/app/Fake.Testing.Common/Fake.Testing.Common.fsproj", "{7D629246-957C-4989-A1E6-29C673086925}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.Common", "src\app\Fake.Testing.Common\Fake.Testing.Common.fsproj", "{7D629246-957C-4989-A1E6-29C673086925}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Windows.Chocolatey", "src/app/Fake.Windows.Chocolatey/Fake.Windows.Chocolatey.fsproj", "{A95B731B-5887-4EF5-A64D-B643FA8EBD92}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Windows.Chocolatey", "src\app\Fake.Windows.Chocolatey\Fake.Windows.Chocolatey.fsproj", "{A95B731B-5887-4EF5-A64D-B643FA8EBD92}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Tools.Git", "src/app/Fake.Tools.Git/Fake.Tools.Git.fsproj", "{E32B2631-476A-4C2D-AE18-275ED7A22F10}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Tools.Git", "src\app\Fake.Tools.Git\Fake.Tools.Git.fsproj", "{E32B2631-476A-4C2D-AE18-275ED7A22F10}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.FSFormatting", "src/app/Fake.DotNet.FSFormatting/Fake.DotNet.FSFormatting.fsproj", "{80314941-78D5-4928-B943-93FC945E050F}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.FSFormatting", "src\app\Fake.DotNet.FSFormatting\Fake.DotNet.FSFormatting.fsproj", "{80314941-78D5-4928-B943-93FC945E050F}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Paket", "src/app/Fake.DotNet.Paket/Fake.DotNet.Paket.fsproj", "{CDFB2B10-050A-4188-8F72-2BCC61E9814F}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Paket", "src\app\Fake.DotNet.Paket\Fake.DotNet.Paket.fsproj", "{CDFB2B10-050A-4188-8F72-2BCC61E9814F}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.netcore", "src/app/Fake.netcore/Fake.netcore.fsproj", "{6B339DA3-8DED-4262-A427-3C4CCDD00650}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.netcore", "src\app\Fake.netcore\Fake.netcore.fsproj", "{6B339DA3-8DED-4262-A427-3C4CCDD00650}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.SonarQube", "src/app/Fake.Testing.SonarQube/Fake.Testing.SonarQube.fsproj", "{2A985028-4410-40F7-992C-5397DC1ED116}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.SonarQube", "src\app\Fake.Testing.SonarQube\Fake.Testing.SonarQube.fsproj", "{2A985028-4410-40F7-992C-5397DC1ED116}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.OpenCover", "src/app/Fake.DotNet.Testing.OpenCover/Fake.DotNet.Testing.OpenCover.fsproj", "{A9AF015B-43C9-405E-BF74-CE936B8418F9}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.OpenCover", "src\app\Fake.DotNet.Testing.OpenCover\Fake.DotNet.Testing.OpenCover.fsproj", "{A9AF015B-43C9-405E-BF74-CE936B8418F9}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Api.Slack", "src/app/Fake.Api.Slack/Fake.Api.Slack.fsproj", "{58A3EDF0-CA9D-4757-B1E8-2A4E3592B308}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Api.Slack", "src\app\Fake.Api.Slack\Fake.Api.Slack.fsproj", "{58A3EDF0-CA9D-4757-B1E8-2A4E3592B308}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Api.GitHub", "src/app/Fake.Api.GitHub/Fake.Api.GitHub.fsproj", "{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Api.GitHub", "src\app\Fake.Api.GitHub\Fake.Api.GitHub.fsproj", "{4BCE4F9C-8FC2-4207-81F1-20CB07D852DC}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Xamarin", "src/app/Fake.DotNet.Xamarin/Fake.DotNet.Xamarin.fsproj", "{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Xamarin", "src\app\Fake.DotNet.Xamarin\Fake.DotNet.Xamarin.fsproj", "{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Net.Http", "src/app/Fake.Net.Http/Fake.Net.Http.fsproj", "{D24CEE35-B6C0-4C92-AE18-E80F90B69974}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Net.Http", "src\app\Fake.Net.Http\Fake.Net.Http.fsproj", "{D24CEE35-B6C0-4C92-AE18-E80F90B69974}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "dotnet-fake", "src/app/dotnet-fake/dotnet-fake.fsproj", "{DB27F0BB-D546-42B2-85DA-52870B4424FD}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "dotnet-fake", "src\app\dotnet-fake\dotnet-fake.fsproj", "{DB27F0BB-D546-42B2-85DA-52870B4424FD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.UnitTests", "src/test/Fake.Core.UnitTests/Fake.Core.UnitTests.fsproj", "{31A5759B-B562-43C0-A845-14EFA4091543}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.UnitTests", "src\test\Fake.Core.UnitTests\Fake.Core.UnitTests.fsproj", "{31A5759B-B562-43C0-A845-14EFA4091543}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.CloudServices", "src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj", "{D8850C67-0542-427A-ABCB-92174EA42C95}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.CloudServices", "src\app\Fake.Azure.CloudServices\Fake.Azure.CloudServices.fsproj", "{D8850C67-0542-427A-ABCB-92174EA42C95}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.Emulators", "src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj", "{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.Emulators", "src\app\Fake.Azure.Emulators\Fake.Azure.Emulators.fsproj", "{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.Kudu", "src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj", "{A1CAA84D-3C99-4218-AFB6-55EE2288800E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.Kudu", "src\app\Fake.Azure.Kudu\Fake.Azure.Kudu.fsproj", "{A1CAA84D-3C99-4218-AFB6-55EE2288800E}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.WebJobs", "src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj", "{F15967FF-E905-4CAD-9545-E59E0F47AD8E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.WebJobs", "src\app\Fake.Azure.WebJobs\Fake.Azure.WebJobs.fsproj", "{F15967FF-E905-4CAD-9545-E59E0F47AD8E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{539D7B9A-18A1-4D79-86AB-C8B48090CA84}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{901F162F-8925-4390-89C5-9EE2C343F744}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.TeamCity", "src/app/Fake.BuildServer.TeamCity/Fake.BuildServer.TeamCity.fsproj", "{9EA0CFE4-ED50-4CB9-BE93-1AFB9D90C878}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.TeamCity", "src\app\Fake.BuildServer.TeamCity\Fake.BuildServer.TeamCity.fsproj", "{9EA0CFE4-ED50-4CB9-BE93-1AFB9D90C878}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.AppVeyor", "src/app/Fake.BuildServer.AppVeyor/Fake.BuildServer.AppVeyor.fsproj", "{486FA49B-D395-42C5-AFB0-FA85B6D9FDBC}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.AppVeyor", "src\app\Fake.BuildServer.AppVeyor\Fake.BuildServer.AppVeyor.fsproj", "{486FA49B-D395-42C5-AFB0-FA85B6D9FDBC}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.Travis", "src/app/Fake.BuildServer.Travis/Fake.BuildServer.Travis.fsproj", "{31F61589-E899-4C58-AF91-371AC6149032}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.Travis", "src\app\Fake.BuildServer.Travis\Fake.BuildServer.Travis.fsproj", "{31F61589-E899-4C58-AF91-371AC6149032}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.TeamFoundation", "src/app/Fake.BuildServer.TeamFoundation/Fake.BuildServer.TeamFoundation.fsproj", "{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.TeamFoundation", "src\app\Fake.BuildServer.TeamFoundation\Fake.BuildServer.TeamFoundation.fsproj", "{5E1B10FE-3F7A-4D10-A804-3C11EC82C21D}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.CommandLineParsing", "src/app/Fake.Core.CommandLineParsing/Fake.Core.CommandLineParsing.fsproj", "{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.CommandLineParsing", "src\app\Fake.Core.CommandLineParsing\Fake.Core.CommandLineParsing.fsproj", "{CA6EB1B3-EB3A-4063-8A6C-DE099A53A8B1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E09B72E4-D890-46A8-8D14-7367C2E23E9D}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.CommandLine.UnitTests", "src/test/Fake.Core.CommandLine.UnitTests/Fake.Core.CommandLine.UnitTests.fsproj", "{8561A35A-C2A4-43C7-A938-CB35A7747121}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.CommandLine.UnitTests", "src\test\Fake.Core.CommandLine.UnitTests\Fake.Core.CommandLine.UnitTests.fsproj", "{8561A35A-C2A4-43C7-A938-CB35A7747121}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Documentation.DocFx", "src/app/Fake.Documentation.DocFx/Fake.Documentation.DocFx.fsproj", "{77E0066D-A04D-445B-B036-9008A40F8A44}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Documentation.DocFx", "src\app\Fake.Documentation.DocFx\Fake.Documentation.DocFx.fsproj", "{77E0066D-A04D-445B-B036-9008A40F8A44}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Api.HockeyApp", "src/app/Fake.Api.HockeyApp/Fake.Api.HockeyApp.fsproj", "{B636A082-4DB4-439D-8A37-E5214BDC00A3}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Api.HockeyApp", "src\app\Fake.Api.HockeyApp\Fake.Api.HockeyApp.fsproj", "{B636A082-4DB4-439D-8A37-E5214BDC00A3}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.JavaScript.Yarn", "src/app/Fake.JavaScript.Yarn/Fake.JavaScript.Yarn.fsproj", "{DE7579F2-C20F-4C35-BC04-C10362912243}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.JavaScript.Yarn", "src\app\Fake.JavaScript.Yarn\Fake.JavaScript.Yarn.fsproj", "{DE7579F2-C20F-4C35-BC04-C10362912243}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Sql.DacPac", "src/app/Fake.Sql.DacPac/Fake.Sql.DacPac.fsproj", "{3BC4A91C-3381-4BF9-BF11-8E06706CF878}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Sql.DacPac", "src\app\Fake.Sql.DacPac\Fake.Sql.DacPac.fsproj", "{3BC4A91C-3381-4BF9-BF11-8E06706CF878}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Installer.InnoSetup", "src/app/Fake.Installer.InnoSetup/Fake.Installer.InnoSetup.fsproj", "{3C27E2CA-98DC-40ED-B334-87B84D7F3E0D}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Installer.InnoSetup", "src\app\Fake.Installer.InnoSetup\Fake.Installer.InnoSetup.fsproj", "{3C27E2CA-98DC-40ED-B334-87B84D7F3E0D}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.ReportGenerator", "src/app/Fake.Testing.ReportGenerator/Fake.Testing.ReportGenerator.fsproj", "{4E702236-A2B1-4920-B56D-4746CC0726D3}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.ReportGenerator", "src\app\Fake.Testing.ReportGenerator\Fake.Testing.ReportGenerator.fsproj", "{4E702236-A2B1-4920-B56D-4746CC0726D3}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.SpecFlow", "src/app/Fake.DotNet.Testing.SpecFlow/Fake.DotNet.Testing.SpecFlow.fsproj", "{DA58D728-C36A-4DC7-8D92-F2BA13667EA5}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.SpecFlow", "src\app\Fake.DotNet.Testing.SpecFlow\Fake.DotNet.Testing.SpecFlow.fsproj", "{DA58D728-C36A-4DC7-8D92-F2BA13667EA5}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Mage", "src/app/Fake.DotNet.Mage/Fake.DotNet.Mage.fsproj", "{D8CFE7F9-8E14-4B22-9729-7FF431AFE36B}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Mage", "src\app\Fake.DotNet.Mage\Fake.DotNet.Mage.fsproj", "{D8CFE7F9-8E14-4B22-9729-7FF431AFE36B}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Tools.Pickles", "src/app/Fake.Tools.Pickles/Fake.Tools.Pickles.fsproj", "{2EC1798B-3AD5-42FE-9406-F358B995ACC3}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Tools.Pickles", "src\app\Fake.Tools.Pickles\Fake.Tools.Pickles.fsproj", "{2EC1798B-3AD5-42FE-9406-F358B995ACC3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{03CB61B6-EBB8-4C4A-B6A3-0D84D1F78A92}"
 	ProjectSection(SolutionItems) = preProject
 		build.fsx = build.fsx
 	EndProjectSection
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Core.IntegrationTests", "src/test/Fake.Core.IntegrationTests/Fake.Core.IntegrationTests.fsproj", "{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.IntegrationTests", "src\test\Fake.Core.IntegrationTests\Fake.Core.IntegrationTests.fsproj", "{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Windows.Registry", "src/app/Fake.Windows.Registry/Fake.Windows.Registry.fsproj", "{71259EF7-41FD-4068-BD85-E4C7F67EAC25}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Windows.Registry", "src\app\Fake.Windows.Registry\Fake.Windows.Registry.fsproj", "{71259EF7-41FD-4068-BD85-E4C7F67EAC25}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Fsc", "src\app\Fake.DotNet.Fsc\Fake.DotNet.Fsc.fsproj", "{32A82EF2-BB35-40A2-9418-904ECFC1EF47}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.BuildServer.GitLab", "src/app/Fake.BuildServer.GitLab/Fake.BuildServer.GitLab.fsproj", "{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}"
 EndProject
@@ -819,16 +821,16 @@ Global
 		{2EC1798B-3AD5-42FE-9406-F358B995ACC3}.Release|x86.Build.0 = Release|Any CPU
 		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x64.ActiveCfg = Debug|x64
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x64.Build.0 = Debug|x64
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x86.ActiveCfg = Debug|x86
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x86.Build.0 = Debug|x86
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Debug|x86.Build.0 = Debug|Any CPU
 		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x64.ActiveCfg = Release|x64
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x64.Build.0 = Release|x64
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x86.ActiveCfg = Release|x86
-		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x86.Build.0 = Release|x86
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x64.Build.0 = Release|Any CPU
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C}.Release|x86.Build.0 = Release|Any CPU
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -841,6 +843,18 @@ Global
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25}.Release|x64.Build.0 = Release|Any CPU
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25}.Release|x86.ActiveCfg = Release|Any CPU
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25}.Release|x86.Build.0 = Release|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Debug|x64.Build.0 = Debug|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Debug|x86.Build.0 = Debug|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|x64.ActiveCfg = Release|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|x64.Build.0 = Release|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|x86.ActiveCfg = Release|Any CPU
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47}.Release|x86.Build.0 = Release|Any CPU
 		{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F778A9E5-FC1A-4934-A6B9-98C84BE9A667}.Debug|x64.ActiveCfg = Debug|x64
@@ -918,6 +932,7 @@ Global
 		{2EC1798B-3AD5-42FE-9406-F358B995ACC3} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
 		{AFEF80BC-0B9A-42D8-A830-3FF1946DF51C} = {E09B72E4-D890-46A8-8D14-7367C2E23E9D}
 		{71259EF7-41FD-4068-BD85-E4C7F67EAC25} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
+		{32A82EF2-BB35-40A2-9418-904ECFC1EF47} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
 		{F778A9E5-FC1A-4934-A6B9-98C84BE9A667} = {901F162F-8925-4390-89C5-9EE2C343F744}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/build.fsx b/build.fsx
index aec097ab0ee..6a8d4924980 100644
--- a/build.fsx
+++ b/build.fsx
@@ -331,6 +331,7 @@ let dotnetAssemblyInfos =
       "Fake.Documentation.DocFx", "Documentation with DocFx"
       "Fake.DotNet.AssemblyInfoFile", "Writing AssemblyInfo files"
       "Fake.DotNet.Cli", "Running the dotnet cli"
+      "Fake.DotNet.Fsc", "Running the f# compiler - fsc"
       "Fake.DotNet.FSFormatting", "Running fsformatting.exe and generating documentation"
       "Fake.DotNet.Mage", "Manifest Generation and Editing Tool"
       "Fake.DotNet.MSBuild", "Running msbuild"
diff --git a/help/templates/template.cshtml b/help/templates/template.cshtml
index d1991a8b6b1..6bf02905671 100644
--- a/help/templates/template.cshtml
+++ b/help/templates/template.cshtml
@@ -121,6 +121,7 @@
 															<ul>
 																<li><a href="/dotnet-cli.html">Cli</a></li>
 																<li><a href="/dotnet-assemblyinfo.html">AssemblyInfoFile</a></li>
+                                                                <li><a href="/apidocs/v5/fake-dotnet-fsc.html">Fsc</a></li>
 																<li><a href="/apidocs/v5/fake-dotnet-msbuild.html">MSBuild</a></li>
 																<li><a href="/apidocs/v5/fake-dotnet-testing-nunit3.html">Testing - NUnit</a></li>
 																<li><a href="/apidocs/v5/fake-dotnet-testing-mspec.html">Testing - MSpec</a></li>
diff --git a/src/app/Fake.DotNet.Fsc/AssemblyInfo.fs b/src/app/Fake.DotNet.Fsc/AssemblyInfo.fs
new file mode 100644
index 00000000000..205ef7d1e2c
--- /dev/null
+++ b/src/app/Fake.DotNet.Fsc/AssemblyInfo.fs
@@ -0,0 +1,17 @@
+// Auto-Generated by FAKE; do not edit
+namespace System
+open System.Reflection
+
+[<assembly: AssemblyTitleAttribute("FAKE - F# Make FSC Wrapper")>]
+[<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
+[<assembly: AssemblyVersionAttribute("5.0.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("5.0.0-beta025")>]
+[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
+do ()
+
+module internal AssemblyVersionInformation =
+    let [<Literal>] AssemblyTitle = "FAKE - F# Make FSC Wrapper"
+    let [<Literal>] AssemblyProduct = "FAKE - F# Make"
+    let [<Literal>] AssemblyVersion = "5.0.0"
+    let [<Literal>] AssemblyInformationalVersion = "5.0.0-beta025"
+    let [<Literal>] AssemblyFileVersion = "5.0.0"
diff --git a/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj b/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj
new file mode 100644
index 00000000000..bd8cb72c520
--- /dev/null
+++ b/src/app/Fake.DotNet.Fsc/Fake.DotNet.Fsc.fsproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
+    <AssemblyName>Fake.DotNet.Fsc</AssemblyName>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);FX_NO_REMOTING;USE_ASYNC_LOCAL</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="Fsc.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Fake.Core.Process\Fake.Core.Process.fsproj" />
+    <ProjectReference Include="..\Fake.IO.FileSystem\Fake.IO.FileSystem.fsproj" />
+    <ProjectReference Include="..\Fake.Core.Trace\Fake.Core.Trace.fsproj" />
+    <ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
+  </ItemGroup>
+  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/src/app/Fake.DotNet.Fsc/Fsc.fs b/src/app/Fake.DotNet.Fsc/Fsc.fs
new file mode 100644
index 00000000000..368ae2ba75d
--- /dev/null
+++ b/src/app/Fake.DotNet.Fsc/Fsc.fs
@@ -0,0 +1,480 @@
+/// Contains tasks to compiles F# source file with the [FSharp.Compiler.Service](https://github.com/fsharp/FSharp.Compiler.Service).
+/// There is also a tutorial about the [F# compiler tasks](../fsc.html) available.
+[<RequireQualifiedAccess>]
+module Fake.DotNet.Fsc
+
+open System
+open Microsoft.FSharp.Compiler.SourceCodeServices
+open Fake.IO
+open Fake.Core
+
+
+type TargetType = 
+    /// Build a console executable
+    | Exe
+    ///  Build a Windows executable
+    | Winexe
+    /// Build a library
+    | Library
+    /// Build a module that can be added to another assembly (.netmodule)
+    | Module
+    override self.ToString () =
+        match self with
+        | Exe     -> "exe"
+        | Winexe  -> "winexe"
+        | Library -> "library"
+        | Module  -> "module"
+
+
+/// Limit which platforms the compiled code can run on: 
+///     x86, Itanium, x64, anycpu32bitpreferred, or anycpu. 
+/// The default is anycpu.
+type PlatformType = 
+    | X86 | Itanium | X64 | AnyCpu32BitPreferred | AnyCpu
+    override self.ToString () =
+        match self with
+        | X86                  -> "x86" 
+        | Itanium              -> "Itanium"
+        | X64                  -> "x64"
+        | AnyCpu32BitPreferred -> "anycpu32bitpreferred"
+        | AnyCpu               -> "anycpu"
+
+/// Specify debugging type: full, pdbonly. 
+/// ('full' is the default and enables attaching a debugger to a running program).
+type DebugType = 
+    | Full | PdbOnly
+    override self.ToString () =
+        (function Full -> "full" | PdbOnly -> "pdbonly") self
+
+/// Specify target framework profile of this assembly. 
+/// Valid values are mscorlib or netcore. Default - mscorlib
+type Profile = 
+    | MsCorlib | Netcore
+    override self.ToString () =
+        (function MsCorlib -> "mscorlib" | Netcore -> "netcore") self
+
+/// Used to set the Accessiblity of an embeded or linked resource 
+type Access = 
+    | Public | Private
+    override self.ToString () =
+        (function Public -> "public" | Private -> "private") self
+
+
+/// Optimization options that can be disabled or enabled selectively by listing them
+/// with the optimize compiler flag
+type Optimization =
+    | NoJitOptimize | NoJitTracking | NoLocalOptimize | NoCrossoptimize | NoTailcalls
+    override self.ToString () =
+        match self with
+        | NoJitOptimize    -> "nojitoptimize" 
+        | NoJitTracking    -> "nojittracking"
+        | NoLocalOptimize  -> "nolocaloptimize"
+        | NoCrossoptimize  -> "nocrossoptimize"
+        | NoTailcalls      -> "notailcalls"
+
+
+/// Specified path of a managed resource with an optional name alias and accessiblity flag
+/// resinfo format is <file>[,<stringname>[,public|private]]
+/// e.g. `resource.dat,rezName,public`
+type ResourceInfo = string * string option * Access option
+
+let resourceStr ((file, name, access):ResourceInfo) =
+    match file, name, access with
+    | f, None   , None      -> f
+    | f, Some n , None      -> sprintf "%s,%s" f n
+    | f, None   , Some a    -> sprintf "%s,%s" f (string a)
+    | f, Some n , Some a    -> sprintf "%s,%s,%s" f n (string a)
+
+type FscParam =
+(* - OUTPUT FILES - *)
+    /// Name of the output file
+    | Out of file:string
+    /// The 'fsc.exe' output target types : exe, winexe, library, module
+    | Target of TargetType
+    /// Delay-sign the assembly using only the public portion of the strong name key
+    | DelaySign of on:bool
+    /// Write the xmldoc of the assembly to the given file
+    | Doc of file:string
+    /// Specify a strong name key file
+    | KeyFile of file:string
+    /// Specify a strong name key container
+    | KeyContainer of name:string
+    /// Limit which platforms the compiled code can run on: 
+    | Platform of platform:PlatformType
+    /// Only include optimization information essential for implementing inlined constructs. 
+    /// Inhibits cross-module inlining but improves binary compatibility.
+    | NoOptimizationData
+    /// Don't add a resource to the generated assembly containing F#-specific metadata
+    | NoInterfacedata
+    /// Print the inferred interface of the assembly to a file
+    | Sig of file:string
+
+(* - INPUT FILES - *)
+    /// Reference an assembly
+    | Reference of dllPath:string
+    /// Reference assemblies in the order listed
+    | References of dllPaths:string list
+
+(* - RESOURCES - *)
+    /// Specify a Win32 resource file (.res)
+    | Win32res of file:string
+    /// Specify a Win32 manifest file
+    | Win32Manifest of file:string
+    /// Do not include the default Win32 manifest
+    | NoWin32Manifest
+    /// Embed the specified managed resource
+    | Resource of resInfo:ResourceInfo
+    /// Link the specified resource to this assembly
+    | LinkResource of resInfo:ResourceInfo
+
+(* - CODE GENERATION - *)
+    /// Emit debug information
+    | Debug of on:bool
+    /// Specify debugging type: full, pdbonly. 
+    /// ('full' is the default and enables attaching a debugger to a running program).
+    | DebugType of debugType:DebugType
+    /// Enable optimizations
+    | Optimize of on:bool * optimizations:Optimization list
+    /// Enable or disable tailcalls
+    | Tailcalls of on:bool
+    /// Enable or disable cross-module optimizations
+    | CrossOptimize of on:bool
+
+(* - ERRORS AND WARNINGS - *)
+    /// Report all warnings as errors
+    | WarnAsError of on:bool
+    /// Report specific warnings as errors
+    | WarnAsErrors of on:bool * warningCodes:int list
+    /// Set a warning level (0-5)
+    | Warn of level:int
+    /// Disable specific warning messages
+    | NoWarn of warningCodes:int list
+    /// Enable specific warnings that may be off by default
+    | WarnOn of warningCodes:int list
+    /// Output warning and error messages in color
+    | ConsoleColors of on:bool
+
+(* - LANGUAGE - *)
+    /// Generate overflow checks
+    | Checked of on:bool
+    /// Define a conditional compilation symbols
+    | Define of symbol:string
+    /// Define a list of conditional compilation symbols
+    | Definitions of symbols: string list
+    /// Ignore ML compatibility warnings
+    | MLCompatibility
+
+(* - MISCELLANEOUS - *)
+    /// Suppress compiler copyright message
+    | NoLogo
+    ///  Display the commandline flags and their usage
+    | Help
+
+(* - ADVANCED - *)
+    /// Specify the codepage used to read source files
+    | Codepage of n:int 
+    /// Displays timing information for compilation.
+    | Times
+    /// Output messages in UTF-8 encoding
+    | Utf8Output
+    /// Output messages with fully qualified paths
+    | FullPaths
+    ///  Specify a directory for the include path which is used to resolve source files and assemblies
+    | Lib of directories:string list
+    /// Base address for the library to be built
+    | BaseAddress of address:string
+    /// Do not reference the default CLI assemblies by default
+    | NoFramework
+    /// Statically link the F# library and all referenced DLLs 
+    /// that depend on it into the assembly being generated
+    | Standalone
+    /// Statically link the given assembly and all referenced DLLs that depend on this assembly. 
+    /// Use an assembly name e.g. mylib, not a DLL name.
+    | StaticLink of assemblyName:string
+    /// Name the output debug file
+    | Pdb of debugFile:string
+    /// Resolve assembly references using directory-based rules rather than MSBuild resolution
+    | SimpleResolution
+    /// Enable high-entropy ASLR
+    | HighEntropyVA of on:bool
+    /// Specifies the version of the OS subsystem to be used by the generated executable. 
+    /// Use 6.02 for Windows 8, 6.01 for Windows 7, 6.00 for Windows Vista. 
+    /// This option only applies to executables, not DLL  and need only be used if your application 
+    /// depends on specific security features available only on certain versions of the OS
+    | SubsystemVersion of version:string
+    /// Specify target framework profile of this assembly.
+    | TargetProfile of profile:Profile
+    /// Emit debug information in quotations
+    | QuotationsDebug of on:bool
+
+    override self.ToString () =
+        // commandline formatting helper functions 
+        /// format a standalone compiler arg: "--%s"
+        let arg s = sprintf "--%s" s
+        /// format a compiler arg with a parameter: "--%s:%s"
+        let argp s p = sprintf "--%s:%s" s p            
+        /// format a short form compiler arg with a parameter: "-%s:%s"
+        let sargp s p = sprintf "-%s:%s" s p  // for short forms          
+        /// helper function to convert a bool to a "+" or "-"
+        let inline chk b = if b then "+" else "-"
+        /// format a compiler arg that ends with "+" or "-": "--%s%s"
+        let togl s b = sprintf "--%s%s" s (chk b)
+        /// format a short form compiler arg that ends with "+" or "-": "-%s%s"
+        let stogl s b = if b then sprintf "-%s" s else "" // for short forms       
+        /// format a list of compiler args with string parameters "--%s:\"%s\""   
+        let argls s (ls:string list) = sprintf "--%s:\"%s\"" s (String.concat ";" ls)
+        /// format a compiler arg that ends with "+" or "-" with string parameters  "--%s%s:\"%s\""
+        let inline toglls s b (ls:'a list) = 
+            sprintf "--%s%s:\"%s\"" s  (chk b) (String.concat ";" (List.map string ls))
+        /// format a list of short form complier args using the same symbol 
+        let sargmap sym ls = ls |> List.map (sargp sym) |> String.concat ";" 
+
+        match self with
+        | Out file -> argp "out" file
+        | Target t -> argp "target" <| string t
+        | DelaySign on -> togl "delaysign" on
+        | Doc file ->  argp "doc" file
+        | KeyFile file -> argp "keyfile" file
+        | KeyContainer name -> argp "keycontainer" name
+        | Platform p -> argp "platform" <| string p
+        | NoOptimizationData -> arg "nooptimizationdata"
+        | NoInterfacedata -> arg "nointerfacedata"
+        | Sig file -> argp "sig" file
+        | Reference dllPath -> sargp "r" dllPath
+        | References dllPaths -> 
+            dllPaths 
+            |> List.map (sargp "r" >> sprintf "\"%s\"") 
+            |> String.concat (sprintf "; %s" Environment.NewLine)
+            |> (fun x -> x.Substring(1, x.Length - 2))
+        | Win32res file -> argp "win32res" file
+        | Win32Manifest file -> argp "win32manifest" file
+        | NoWin32Manifest -> arg "nowin32manifest"
+        | Resource rinfo -> argp "resource" <| resourceStr rinfo
+        | LinkResource rinfo -> argp "linkresource" <| resourceStr rinfo
+        | Debug on -> stogl "g" on
+        | DebugType dt -> argp "debug" <| string dt
+        | Optimize (on,opts)-> 
+            match opts with
+            | [] -> stogl "O" on
+            | _ -> toglls "O" on opts
+        | Tailcalls on -> togl "tailcalls" on
+        | CrossOptimize on -> togl "crossoptimize" on
+        | WarnAsError on -> togl "warnaserror" on
+        | WarnAsErrors (on, warningCodes) ->  toglls "warnaserror" on warningCodes
+        | Warn lvl -> argp "warn" <| string (if lvl < 0 then 0 elif lvl > 5 then 5 else lvl)
+        | NoWarn warningCodes -> argls "nowarn" (List.map string warningCodes)
+        | WarnOn warningCodes -> argls "warnon" (List.map string warningCodes)
+        | ConsoleColors on -> togl "consolecolors" on
+        | Checked on -> togl "checked" on
+        | Define symbol -> sargp "d" symbol
+        | Definitions symbols -> sargmap "d" symbols
+        | MLCompatibility -> arg "mlcompatibility"
+        | NoLogo -> arg "nologo"
+        | Help -> arg "help"
+        | Codepage n -> argp "codepage" <| string n
+        | Utf8Output -> arg "utf8output"
+        | FullPaths -> arg "fullpaths"
+        | Lib directories -> argls "lib" directories
+        | BaseAddress address -> argp "baseaddress" address
+        | NoFramework -> arg "noframework"
+        | Standalone -> arg "standalone"
+        | StaticLink file -> argp "staticlink" file
+        | Pdb debugFile -> argp "pdb" debugFile
+        | SimpleResolution -> arg "simpleresolution"
+        | HighEntropyVA on -> togl "highentropyva" on
+        | SubsystemVersion version -> argp "subsystemversion" version
+        | TargetProfile profile -> argp "targetprofile" <| string profile
+        | QuotationsDebug on -> togl "quotations-debug" on
+        | Times -> arg "times"
+
+    static member Defaults =
+        [   Out "" 
+            Target Exe
+            Platform AnyCpu
+            References []
+            Debug false        
+        ]
+
+///Common Error Result type for tracing errors
+type FscResultMessage = 
+    | Warning of string 
+    | Error of string
+
+/// Type signature for a Compiler Function
+type CompilerFunc = string [] -> ( FscResultMessage [] * int )
+
+
+/// Computes output type and appends source files to argument list
+let private makeArgsList (opts: string list) (srcFiles: string list) = 
+    let outputArg arg = arg = "-o" || arg.StartsWith("--out:")
+    let libTarget arg = arg = "-a" || arg = "--target:library"
+    let hasOutputArg = Seq.exists outputArg
+    let hasLibTarget = Seq.exists libTarget
+
+    // If output file name is specified, pass it on to fsc.
+    if opts |> hasOutputArg 
+        then opts @ srcFiles
+    // But if it's not, then figure out what it should be.
+    else 
+        let outExt = if opts |> hasLibTarget then ".dll" else ".exe"
+        "-o" :: Path.changeExtension outExt (List.head srcFiles) :: opts @ srcFiles
+    |> Array.ofList
+
+/// Reports Fsc compile errors to the console using Fake.Core.Trace
+let private reportErrors (errors: FscResultMessage []) = 
+    for e in errors do
+        match e with
+        | FscResultMessage.Warning errMsg -> Trace.traceImportant errMsg
+        | FscResultMessage.Error errMsg -> Trace.traceError errMsg
+
+/// Compiles the given source files with the given options using either
+/// the internal FCS or an external fsc.exe. If no options
+/// given (i.e. the second argument is an empty list), by default tries
+/// to behave the same way as would the command-line 'fsc.exe' tool.
+let private compileFiles (compiler: CompilerFunc) (srcFiles : string list) (opts : string list) : int = 
+    let optsArr = makeArgsList opts srcFiles
+
+    Trace.trace <| sprintf "FSC with args:%A" optsArr
+    let errors, exitCode = compiler optsArr
+    
+    reportErrors errors
+    exitCode
+
+/// Common compiler arg prep code
+let private doCompile (compiler: CompilerFunc) (fscParams : FscParam list) (inputFiles : string list) : int = 
+    let inputFiles = inputFiles |> Seq.toList
+    let taskDesc = inputFiles |> String.separated ", "
+    let fscParams = if fscParams = [] then FscParam.Defaults else fscParams
+    let argList = fscParams |> List.map string
+
+    use __ = Trace.traceTask "Fsc " taskDesc
+    let res = compileFiles compiler inputFiles argList
+    res
+
+
+(*
+Compile using the internals of FCS
+*)
+/// The internal FCS Compiler
+let private scsCompile optsArr = 
+    let scs = FSharpChecker.Create()
+    // Always prepend "fsc.exe" since fsc compiler skips the first argument
+    let optsArr = Array.append [|"fsc.exe"|] optsArr
+    let errors, exitcode = scs.Compile optsArr |> Async.RunSynchronously
+
+    /// Better compile reporting thanks to:
+    /// https://github.com/jbtule/ComposableExtensions/blob/5b961b30668bb7f4d17238770869b5a884bc591f/tools/CompilerHelper.fsx#L233
+    let errors = errors |> Array.map (fun (e: FSharpErrorInfo) -> 
+        match e.Severity with
+            | FSharpErrorSeverity.Error -> FscResultMessage.Error e.Message
+            | FSharpErrorSeverity.Warning -> FscResultMessage.Warning e.Message)
+
+    errors, exitcode
+
+/// Compiles the given F# source files with the specified parameters.
+///
+/// ## Parameters
+///
+///  - `setParams` - Function used to overwrite the default Fsc parameters.
+///  - `inputFiles` - The F# input files.
+///
+/// ## Returns
+///
+/// The exit status code of the compile process.
+///
+/// ## Sample
+///
+///     ["file1.fs"; "file2.fs"]
+///     |> compileWithResult [Out "" 
+///                 Target Exe
+///                 Platform AnyCpu
+///                 References []
+///                 Debug false 
+///             ]
+let compileWithResult (fscParams : FscParam list) (inputFiles : string list) : int = 
+    doCompile scsCompile fscParams inputFiles
+
+/// Compiles one or more F# source files with the specified parameters.
+/// ## Parameters
+///
+///  - `setParams` - Function used to overwrite the default Fsc parameters.
+///  - `inputFiles` - The F# input files.
+///
+/// ## Sample
+///
+///     ["file1.fs"; "file2.fs"]
+///     |> compile [Out "" 
+///                 Target Exe
+///                 Platform AnyCpu
+///                 References []
+///                 Debug false 
+///             ]
+let compile (fscParams : FscParam list) (inputFiles : string list) : unit = 
+    let res = compileWithResult fscParams inputFiles
+    if res <> 0 then raise <| BuildException("Fsc: compile failed with exit code", [ string res ])
+
+
+(*
+Compile using a path to Fsc.exe
+*)
+/// An external fsc.exe compiler
+let private extFscCompile (fscTool: string) (optsArr: string []) = 
+    let args = (Arguments.OfArgs optsArr).ToWindowsCommandLine
+    let r = 
+        Process.execWithResult (fun info -> 
+        { info with
+            FileName = fscTool
+            Arguments = args
+        } ) TimeSpan.MaxValue
+
+    let errors = r.Errors |> List.map FscResultMessage.Warning |> List.toArray
+    errors, r.ExitCode
+
+/// Compiles the given F# source files with the specified parameters.
+///
+/// ## Parameters
+///
+///  - `fscTool` - Path to an existing fsc.exe executable
+///  - `setParams` - Function used to overwrite the default Fsc parameters.
+///  - `inputFiles` - The F# input files.
+///
+/// ## Returns
+///
+/// The exit status code of the compile process.
+///
+/// ## Sample
+///
+///     ["file1.fs"; "file2.fs"]
+///     |> compileExternalWithResult "path/to/fsc.exe" 
+///                 [Out "" 
+///                 Target Exe
+///                 Platform AnyCpu
+///                 References []
+///                 Debug false 
+///             ]          
+let compileExternalWithResult (fscTool: string) (fscParams : FscParam list) (inputFiles : string list) : int = 
+    let compile = extFscCompile fscTool
+    doCompile compile fscParams inputFiles
+
+/// Compiles one or more F# source files with the specified parameters 
+/// using an existing fsc.exe installed on the system
+/// ## Parameters
+///
+///  - `fscTool` - Path to an existing fsc.exe executable
+///  - `setParams` - Function used to overwrite the default Fsc parameters.
+///  - `inputFiles` - The F# input files.
+///
+/// ## Sample
+///
+///     ["file1.fs"; "file2.fs"]
+///     |> compileExternal "path/to/fsc.exe" 
+///                 [Out "" 
+///                 Target Exe
+///                 Platform AnyCpu
+///                 References []
+///                 Debug false 
+///             ]
+let compileExternal (fscTool: string) (fscParams : FscParam list) (inputFiles : string list) : unit = 
+    let compile = extFscCompile fscTool
+    let res = doCompile compile fscParams inputFiles
+    if res <> 0 then raise <| BuildException("Fsc: compile failed with exit code", [ string res ])
diff --git a/src/app/Fake.DotNet.Fsc/paket.references b/src/app/Fake.DotNet.Fsc/paket.references
new file mode 100644
index 00000000000..b7c31d76b69
--- /dev/null
+++ b/src/app/Fake.DotNet.Fsc/paket.references
@@ -0,0 +1,5 @@
+group netcore
+
+FSharp.Core
+NETStandard.Library
+FSharp.Compiler.Service
diff --git a/src/legacy/FakeLib/FakeLib.fsproj b/src/legacy/FakeLib/FakeLib.fsproj
index a2a3212ecdb..d2d8375a7a5 100644
--- a/src/legacy/FakeLib/FakeLib.fsproj
+++ b/src/legacy/FakeLib/FakeLib.fsproj
@@ -397,6 +397,9 @@
     <Compile Include="..\..\app\Fake.Windows.Registry\Registry.fs">
       <Link>Fake.Windows.Registry\Registry.fs</Link>
     </Compile>
+    <Compile Include="..\..\app\Fake.DotNet.Fsc\Fsc.fs">
+      <Link>Fake.DotNet.Fsc\Fsc.fs</Link>
+    </Compile>
     <Compile Include="UserInputHelper.fs" />
     <Compile Include="CSharpHelper.fs" />
     <Compile Include="EnvironmentHelper.fs" />
diff --git a/src/legacy/FakeLib/FscHelper.fs b/src/legacy/FakeLib/FscHelper.fs
index 12ce8d6fd2e..d28512e09e3 100644
--- a/src/legacy/FakeLib/FscHelper.fs
+++ b/src/legacy/FakeLib/FscHelper.fs
@@ -1,6 +1,6 @@
 /// Contains tasks to compiles F# source file with the [FSharp.Compiler.Service](https://github.com/fsharp/FSharp.Compiler.Service).
 /// There is also a tutorial about the [F# compiler tasks](../fsc.html) available.
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("Use Fake.DotNet.Fsc instead (FAKE0001 - package: Fake.DotNet.Fsc - module: Fake.DotNet.Fsc)")>]
 module Fake.FscHelper
 
 open System
@@ -160,7 +160,7 @@ let Fsc (setParams : FscParams -> FscParams) (inputFiles : string list) : unit =
 
 // FSCHELPER vNEXT
 
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type TargetType = 
     /// Build a console executable
     | Exe
@@ -181,7 +181,7 @@ type TargetType =
 /// Limit which platforms the compiled code can run on: 
 ///     x86, Itanium, x64, anycpu32bitpreferred, or anycpu. 
 /// The default is anycpu.
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type PlatformType = 
     | X86 | Itanium | X64 | AnyCpu32BitPreferred | AnyCpu
     override self.ToString () =
@@ -194,7 +194,7 @@ type PlatformType =
 
 /// Specify debugging type: full, pdbonly. 
 /// ('full' is the default and enables attaching a debugger to a running program).
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type DebugType = 
     | Full | PdbOnly
     override self.ToString () =
@@ -202,14 +202,14 @@ type DebugType =
 
 /// Specify target framework profile of this assembly. 
 /// Valid values are mscorlib or netcore. Default - mscorlib
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type Profile = 
     | MsCorlib | Netcore
     override self.ToString () =
         (function MsCorlib -> "mscorlib" | Netcore -> "netcore") self
 
 /// Used to set the Accessiblity of an embeded or linked resource 
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type Access = 
     | Public | Private
     override self.ToString () =
@@ -218,7 +218,7 @@ type Access =
 
 /// Optimization options that can be disabled or enabled selectively by listing them
 /// with the optimize compiler flag
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type Optimization =
     | NoJitOptimize | NoJitTracking | NoLocalOptimize | NoCrossoptimize | NoTailcalls
     override self.ToString () =
@@ -233,10 +233,10 @@ type Optimization =
 /// Specified path of a managed resource with an optional name alias and accessiblity flag
 /// resinfo format is <file>[,<stringname>[,public|private]]
 /// e.g. `resource.dat,rezName,public`
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type ResourceInfo = string * string option * Access option
 
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 let resourceStr ((file, name, access):ResourceInfo) =
     match file, name, access with
     | f, None   , None      -> f
@@ -244,7 +244,7 @@ let resourceStr ((file, name, access):ResourceInfo) =
     | f, None   , Some a    -> sprintf "%s,%s" f (string a)
     | f, Some n , Some a    -> sprintf "%s,%s,%s" f n (string a)
 
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 type FscParam =
 (* - OUTPUT FILES - *)
     /// Name of the output file
@@ -447,7 +447,7 @@ type FscParam =
         | QuotationsDebug on -> togl "quotations-debug" on
         | Times -> arg "times"
 
-    [<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+    [<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
     static member Defaults =
         [   Out "" 
             Target Exe
@@ -459,7 +459,7 @@ type FscParam =
 /// Compiles the given source file with the given options. If no options
 /// given (i.e. the second argument is an empty list), by default tries
 /// to behave the same way as would the command-line 'fsc.exe' tool.
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 let compileFiles (srcFiles : string list) (opts : string list) : int = 
     let scs = FSharpChecker.Create()
     
@@ -507,7 +507,7 @@ let compileFiles (srcFiles : string list) (opts : string list) : int =
 ///                 References []
 ///                 Debug false 
 ///             ]
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the function CompileWithResult in the Fake.DotNet.Fsc module instead")>]
 let compile (fscParams : FscParam list) (inputFiles : string list) : int = 
     let inputFiles = inputFiles |> Seq.toList
     let taskDesc = inputFiles |> separated ", "
@@ -532,7 +532,7 @@ let compile (fscParams : FscParam list) (inputFiles : string list) : int =
 ///                 References []
 ///                 Debug false 
 ///             ]
-[<System.Obsolete("This function, type or module is obsolete. There is no alternative in FAKE 5 yet. If you need this functionality consider porting the module (https://fake.build/contributing.html#Porting-a-module-to-FAKE-5).")>]
+[<System.Obsolete("FAKE0001 Use the Fake.DotNet.Fsc module instead")>]
 let Compile (fscParams : FscParam list) (inputFiles : string list) : unit = 
     let res = compile fscParams inputFiles
     if res <> 0 then raise <| BuildException("Fsc: compile failed with exit code", [ string res ])