Skip to content

Commit 9262e46

Browse files
matthidmatthid
authored
Merge pull request #1815 from fsharp/beta_024
Beta 024
2 parents ca79b3f + b38641a commit 9262e46

24 files changed

+1939
-1178
lines changed

‎.fake/build.fsx/intellisense.fsx

+25-25
Original file line numberDiff line numberDiff line change
@@ -59,36 +59,36 @@
5959
#r "C:\\Users\\matth\\.nuget\\packages\\system.runtime\\4.3.0\\lib\\net462\\System.Runtime.dll"
6060
#r "C:\\Users\\matth\\.nuget\\packages\\system.security.principal.windows\\4.4.1\\lib\\net461\\System.Security.Principal.Windows.dll"
6161
#r "C:\\Users\\matth\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.4.0\\lib\\net461\\System.Security.Cryptography.ProtectedData.dll"
62-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-beta022\\lib\\net46\\Fake.Core.Xml.dll"
63-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-beta022\\lib\\net46\\Fake.Core.SemVer.dll"
62+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.xml\\5.0.0-beta023\\lib\\net46\\Fake.Core.Xml.dll"
63+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.semver\\5.0.0-beta023\\lib\\net46\\Fake.Core.SemVer.dll"
6464
#r "C:\\Users\\matth\\.nuget\\packages\\paket.core\\5.148.0\\lib\\net45\\Paket.Core.dll"
65-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-beta022\\lib\\net46\\Fake.Api.GitHub.dll"
66-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-beta022\\lib\\net46\\Fake.Core.Context.dll"
67-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-beta022\\lib\\net46\\Fake.Core.Environment.dll"
68-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-beta022\\lib\\net46\\Fake.Core.String.dll"
65+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.api.github\\5.0.0-beta023\\lib\\net46\\Fake.Api.GitHub.dll"
66+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.context\\5.0.0-beta023\\lib\\net46\\Fake.Core.Context.dll"
67+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.environment\\5.0.0-beta023\\lib\\net46\\Fake.Core.Environment.dll"
68+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.string\\5.0.0-beta023\\lib\\net46\\Fake.Core.String.dll"
6969
#r "C:\\Users\\matth\\.nuget\\packages\\system.reflection.metadata\\1.5.0\\lib\\netstandard2.0\\System.Reflection.Metadata.dll"
7070
#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0-beta7\\lib\\net40\\Mono.Cecil.Rocks.dll"
7171
#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0-beta7\\lib\\net40\\Mono.Cecil.Pdb.dll"
7272
#r "C:\\Users\\matth\\.nuget\\packages\\mono.cecil\\0.10.0-beta7\\lib\\net40\\Mono.Cecil.Mdb.dll"
73-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-beta022\\lib\\net46\\Fake.Core.ReleaseNotes.dll"
74-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-beta022\\lib\\net46\\Fake.IO.FileSystem.dll"
75-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-beta022\\lib\\net46\\Fake.Core.Trace.dll"
76-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-beta022\\lib\\net46\\Fake.Core.Tasks.dll"
77-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-beta022\\lib\\net46\\Fake.Testing.Common.dll"
78-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-beta022\\lib\\net46\\Fake.Core.Process.dll"
79-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll"
80-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-beta022\\lib\\net46\\Fake.IO.Zip.dll"
81-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-beta022\\lib\\net46\\Fake.Core.Target.dll"
82-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.NuGet.dll"
83-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll"
84-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll"
85-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll"
86-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.Cli.dll"
87-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.FSFormatting.dll"
88-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.MsBuild.dll"
89-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-beta022\\lib\\net46\\Fake.DotNet.Paket.dll"
90-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-beta022\\lib\\net46\\Fake.Tools.Git.dll"
91-
#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-beta022\\lib\\net46\\Fake.Windows.Chocolatey.dll"
73+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.releasenotes\\5.0.0-beta023\\lib\\net46\\Fake.Core.ReleaseNotes.dll"
74+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.filesystem\\5.0.0-beta023\\lib\\net46\\Fake.IO.FileSystem.dll"
75+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.trace\\5.0.0-beta023\\lib\\net46\\Fake.Core.Trace.dll"
76+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.tasks\\5.0.0-beta023\\lib\\net46\\Fake.Core.Tasks.dll"
77+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.testing.common\\5.0.0-beta023\\lib\\net46\\Fake.Testing.Common.dll"
78+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.process\\5.0.0-beta023\\lib\\net46\\Fake.Core.Process.dll"
79+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.assemblyinfofile\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.AssemblyInfoFile.dll"
80+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.io.zip\\5.0.0-beta023\\lib\\net46\\Fake.IO.Zip.dll"
81+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.core.target\\5.0.0-beta023\\lib\\net46\\Fake.Core.Target.dll"
82+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.nuget\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.NuGet.dll"
83+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.mspec\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.Testing.MSpec.dll"
84+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.nunit\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.Testing.NUnit.dll"
85+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.testing.xunit2\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.Testing.XUnit2.dll"
86+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.cli\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.Cli.dll"
87+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.fsformatting\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.FSFormatting.dll"
88+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.msbuild\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.MsBuild.dll"
89+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.dotnet.paket\\5.0.0-beta023\\lib\\net46\\Fake.DotNet.Paket.dll"
90+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.tools.git\\5.0.0-beta023\\lib\\net46\\Fake.Tools.Git.dll"
91+
#r "C:\\Users\\matth\\.nuget\\packages\\fake.windows.chocolatey\\5.0.0-beta023\\lib\\net46\\Fake.Windows.Chocolatey.dll"
9292
#r "System"
9393
#r "System.Core"
9494
#r "System.Security"

‎Fake.sln

+60
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CCAC5CAB-0
7676
EndProject
7777
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.UnitTests", "src/test/Fake.Core.UnitTests/Fake.Core.UnitTests.fsproj", "{31A5759B-B562-43C0-A845-14EFA4091543}"
7878
EndProject
79+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.CloudServices", "src/app/Fake.Azure.CloudServices/Fake.Azure.CloudServices.fsproj", "{D8850C67-0542-427A-ABCB-92174EA42C95}"
80+
EndProject
81+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.Emulators", "src/app/Fake.Azure.Emulators/Fake.Azure.Emulators.fsproj", "{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}"
82+
EndProject
83+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.Kudu", "src/app/Fake.Azure.Kudu/Fake.Azure.Kudu.fsproj", "{A1CAA84D-3C99-4218-AFB6-55EE2288800E}"
84+
EndProject
85+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Azure.WebJobs", "src/app/Fake.Azure.WebJobs/Fake.Azure.WebJobs.fsproj", "{F15967FF-E905-4CAD-9545-E59E0F47AD8E}"
86+
EndProject
7987
Global
8088
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8189
Debug|Any CPU = Debug|Any CPU
@@ -506,6 +514,54 @@ Global
506514
{31A5759B-B562-43C0-A845-14EFA4091543}.Release|x64.Build.0 = Release|Any CPU
507515
{31A5759B-B562-43C0-A845-14EFA4091543}.Release|x86.ActiveCfg = Release|Any CPU
508516
{31A5759B-B562-43C0-A845-14EFA4091543}.Release|x86.Build.0 = Release|Any CPU
517+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
518+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
519+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Debug|x64.ActiveCfg = Debug|Any CPU
520+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Debug|x64.Build.0 = Debug|Any CPU
521+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Debug|x86.ActiveCfg = Debug|Any CPU
522+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Debug|x86.Build.0 = Debug|Any CPU
523+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
524+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Release|Any CPU.Build.0 = Release|Any CPU
525+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Release|x64.ActiveCfg = Release|Any CPU
526+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Release|x64.Build.0 = Release|Any CPU
527+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Release|x86.ActiveCfg = Release|Any CPU
528+
{D8850C67-0542-427A-ABCB-92174EA42C95}.Release|x86.Build.0 = Release|Any CPU
529+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
530+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
531+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Debug|x64.ActiveCfg = Debug|Any CPU
532+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Debug|x64.Build.0 = Debug|Any CPU
533+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Debug|x86.ActiveCfg = Debug|Any CPU
534+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Debug|x86.Build.0 = Debug|Any CPU
535+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
536+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Release|Any CPU.Build.0 = Release|Any CPU
537+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Release|x64.ActiveCfg = Release|Any CPU
538+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Release|x64.Build.0 = Release|Any CPU
539+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Release|x86.ActiveCfg = Release|Any CPU
540+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1}.Release|x86.Build.0 = Release|Any CPU
541+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
542+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Debug|Any CPU.Build.0 = Debug|Any CPU
543+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Debug|x64.ActiveCfg = Debug|Any CPU
544+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Debug|x64.Build.0 = Debug|Any CPU
545+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Debug|x86.ActiveCfg = Debug|Any CPU
546+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Debug|x86.Build.0 = Debug|Any CPU
547+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Release|Any CPU.ActiveCfg = Release|Any CPU
548+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Release|Any CPU.Build.0 = Release|Any CPU
549+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Release|x64.ActiveCfg = Release|Any CPU
550+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Release|x64.Build.0 = Release|Any CPU
551+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Release|x86.ActiveCfg = Release|Any CPU
552+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E}.Release|x86.Build.0 = Release|Any CPU
553+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
554+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
555+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Debug|x64.ActiveCfg = Debug|Any CPU
556+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Debug|x64.Build.0 = Debug|Any CPU
557+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Debug|x86.ActiveCfg = Debug|Any CPU
558+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Debug|x86.Build.0 = Debug|Any CPU
559+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
560+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|Any CPU.Build.0 = Release|Any CPU
561+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x64.ActiveCfg = Release|Any CPU
562+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x64.Build.0 = Release|Any CPU
563+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x86.ActiveCfg = Release|Any CPU
564+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x86.Build.0 = Release|Any CPU
509565
EndGlobalSection
510566
GlobalSection(SolutionProperties) = preSolution
511567
HideSolutionNode = FALSE
@@ -546,6 +602,10 @@ Global
546602
{D24CEE35-B6C0-4C92-AE18-E80F90B69974} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
547603
{DB27F0BB-D546-42B2-85DA-52870B4424FD} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
548604
{31A5759B-B562-43C0-A845-14EFA4091543} = {CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18}
605+
{D8850C67-0542-427A-ABCB-92174EA42C95} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
606+
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
607+
{A1CAA84D-3C99-4218-AFB6-55EE2288800E} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
608+
{F15967FF-E905-4CAD-9545-E59E0F47AD8E} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
549609
EndGlobalSection
550610
GlobalSection(ExtensibilityGlobals) = postSolution
551611
SolutionGuid = {058A0C5E-2216-4306-8AFB-0AE28320C26A}

‎RELEASE_NOTES.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### 5.0.0-beta024
2+
* ENHANCEMENT: Refactor Dotnet API - https://github.com/fsharp/FAKE/pull/1812
3+
* BUGFIX: Find `dotnet` on `PATH` - https://github.com/fsharp/FAKE/pull/1813
4+
* FAKE5: New modules `Fake.Azure.CloudServices`, `Fake.Azure.Emulators`, `Fake.Azure.Kudu` and `Fake.Azure.WebJobs` - https://github.com/fsharp/FAKE/pull/1757
5+
16
#### 5.0.0-beta023
27
* [CORE-PROCESS] ENHANCEMENT: Experiment with new Process API
38
* [CORE-TRACE] ENHANCEMENT: Add `TraceSecrets`-API to prevent FAKE from printing secrets

‎build.fsx

+60-1
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@ let dotnetAssemblyInfos =
220220
[ "dotnet-fake", "Fake dotnet-cli command line tool"
221221
"Fake.Api.Slack", "Slack Integration Support"
222222
"Fake.Api.GitHub", "GitHub Client API Support via Octokit"
223+
"Fake.Azure.CloudServices", "FAKE - F# Make Azure Cloud Services Support"
224+
"Fake.Azure.Emulators", "FAKE - F# Make Azure Emulators Support"
225+
"Fake.Azure.Kudu", "FAKE - F# Make Azure Kudu Support"
226+
"Fake.Azure.WebJobs", "FAKE - F# Make Azure Web Jobs Support"
223227
"Fake.Core.Context", "Core Context Infrastructure"
224228
"Fake.Core.Environment", "Environment Detection"
225229
"Fake.Core.Process", "Starting and managing Processes"
@@ -411,13 +415,22 @@ Target.Create "DotNetCoreIntegrationTests" (fun _ ->
411415
|> NUnit3.NUnit3 id
412416
)
413417

418+
#if BOOTSTRAP
419+
let withWorkDir wd (cliOpts: DotNet.Options) = { cliOpts with WorkingDirectory = wd }
420+
#else
414421
let withWorkDir wd (cliOpts:Cli.DotNetOptions) = { cliOpts with WorkingDirectory = wd }
422+
#endif
415423

416424
Target.Create "DotNetCoreUnitTests" (fun _ ->
417425
// dotnet run -p src/test/Fake.Core.UnitTests/Fake.Core.UnitTests.fsproj
426+
#if BOOTSTRAP
427+
let processResult =
428+
DotNet.Exec (withWorkDir root) "src/test/Fake.Core.UnitTests/bin/Release/netcoreapp2.0/Fake.Core.UnitTests.dll" "--summary"
429+
#else
418430
let processResult =
419431
Cli.DotNet (withWorkDir root) "src/test/Fake.Core.UnitTests/bin/Release/netcoreapp2.0/Fake.Core.UnitTests.dll" "--summary"
420-
if processResult.ExitCode <> 0 then failwithf "Unit-Tests failed."
432+
#endif
433+
if processResult.ExitCode <> 0 then failwithf "Unit-Tests failed."
421434
)
422435

423436
Target.Create "BootstrapTest" (fun _ ->
@@ -647,6 +660,16 @@ Target.Create "CreateNuGet" (fun _ ->
647660

648661

649662
let LatestTooling options =
663+
#if BOOTSTRAP
664+
{ options with
665+
DotNet.InstallerOptions = (fun io ->
666+
{ io with
667+
Branch = "release/2.1"
668+
})
669+
DotNet.Channel = None
670+
DotNet.Version = DotNet.Version "2.1.4"
671+
}
672+
#else
650673
{ options with
651674
Cli.InstallerOptions = (fun io ->
652675
{ io with
@@ -655,9 +678,18 @@ let LatestTooling options =
655678
Cli.Channel = None
656679
Cli.Version = Cli.Version "2.1.4"
657680
}
681+
#endif
682+
683+
#if BOOTSTRAP
684+
Target.Create "InstallDotNetCore" (fun _ ->
685+
DotNet.Install DotNet.Release_2_1_4
686+
)
687+
#else
658688
Target.Create "InstallDotNetCore" (fun _ ->
689+
659690
Cli.DotNetCliInstall Cli.Release_2_1_4
660691
)
692+
#endif
661693

662694
let netCoreProjs =
663695
!! (appDir </> "*/*.fsproj")
@@ -687,13 +719,23 @@ Target.Create "DotNetPackage_" (fun _ ->
687719

688720

689721
// dotnet pack
722+
#if BOOTSTRAP
723+
DotNet.Pack (fun c ->
724+
{ c with
725+
Configuration = DotNet.Release
726+
OutputPath = Some nugetDir
727+
}) "Fake.sln"
728+
729+
let info = DotNet.Info id
730+
#else
690731
Cli.DotNetPack (fun c ->
691732
{ c with
692733
Configuration = Cli.Release
693734
OutputPath = Some nugetDir
694735
}) "Fake.sln"
695736

696737
let info = Cli.DotNetInfo id
738+
#endif
697739

698740
// dotnet publish
699741
runtimes
@@ -710,12 +752,21 @@ Target.Create "DotNetPackage_" (fun _ ->
710752

711753
//DotNetRestore (fun c -> {c with Runtime = Some runtime}) proj
712754
let outDir = nugetDir @@ projName @@ runtimeName
755+
#if BOOTSTRAP
756+
DotNet.Publish (fun c ->
757+
{ c with
758+
Runtime = Some runtime
759+
Configuration = DotNet.Release
760+
OutputPath = Some outDir
761+
}) proj
762+
#else
713763
Cli.DotNetPublish (fun c ->
714764
{ c with
715765
Runtime = Some runtime
716766
Configuration = Cli.Release
717767
OutputPath = Some outDir
718768
}) proj
769+
#endif
719770
let source = outDir </> "dotnet"
720771
if File.Exists source then
721772
failwithf "Workaround no longer required?" //TODO: If this is not triggered delete this block
@@ -729,11 +780,19 @@ Target.Create "DotNetPackage_" (fun _ ->
729780
// Publish portable as well (see https://docs.microsoft.com/en-us/dotnet/articles/core/app-types)
730781
let netcoreFsproj = appDir </> "Fake.netcore/Fake.netcore.fsproj"
731782
let outDir = nugetDir @@ "Fake.netcore" @@ "portable"
783+
#if BOOTSTRAP
784+
DotNet.Publish (fun c ->
785+
{ c with
786+
Framework = Some "netcoreapp2.0"
787+
OutputPath = Some outDir
788+
}) netcoreFsproj
789+
#else
732790
Cli.DotNetPublish (fun c ->
733791
{ c with
734792
Framework = Some "netcoreapp2.0"
735793
OutputPath = Some outDir
736794
}) netcoreFsproj
795+
#endif
737796

738797
)
739798

0 commit comments

Comments
 (0)