Skip to content

Commit 4660cc5

Browse files
committed
Simplified DotNet build process
1 parent 047f95d commit 4660cc5

File tree

11 files changed

+1043
-914
lines changed

11 files changed

+1043
-914
lines changed

.config/dotnet-tools.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"fake-cli": {
6+
"version": "5.19.1",
7+
"commands": [
8+
"fake"
9+
]
10+
},
11+
"paket": {
12+
"version": "5.242.1",
13+
"commands": [
14+
"paket"
15+
]
16+
}
17+
}
18+
}

.paket/Paket.Restore.targets

Lines changed: 76 additions & 43 deletions
Large diffs are not rendered by default.

build.cmd

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
cls
33

44
dotnet restore build.proj
5-
6-
IF NOT EXIST build.fsx (
7-
fake run init.fsx
8-
)
9-
fake build %*
5+
dotnet tool restore
6+
dotnet paket restore
7+
dotnet fake build %*

build.fsx

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
1-
// --------------------------------------------------------------------------------------
2-
// FAKE build script
3-
// --------------------------------------------------------------------------------------
4-
5-
#r "paket: groupref FakeBuild //"
61

2+
#r @"paket:
3+
nuget Fake.Core.Target
4+
nuget Fake.Core.Process
5+
nuget Fake.Core.ReleaseNotes
6+
nuget Fake.IO.FileSystem
7+
nuget Fake.DotNet.Cli
8+
nuget Fake.DotNet.MSBuild
9+
nuget Fake.DotNet.AssemblyInfoFile
10+
nuget Fake.DotNet.Paket
11+
nuget Fake.DotNet.FSFormatting
12+
nuget Fake.DotNet.Fsi
13+
nuget Fake.DotNet.NuGet
14+
nuget Fake.DotNet.Testing.Expecto
15+
nuget Fake.Tools.Git
16+
nuget Fake.Api.GitHub //"
17+
18+
#if !FAKE
719
#load "./.fake/build.fsx/intellisense.fsx"
20+
#r "netstandard" // Temp fix for https://github.com/dotnet/fsharp/issues/5216
21+
#endif
822

23+
open System
924
open System.IO
1025
open Fake.Core
1126
open Fake.Core.TargetOperators
1227
open Fake.DotNet
28+
open Fake.IO.Globbing
29+
open Fake.DotNet.NuGet
30+
open Fake.DotNet.Testing
1331
open Fake.IO
1432
open Fake.IO.FileSystemOperators
15-
open Fake.IO.Globbing
1633
open Fake.IO.Globbing.Operators
17-
open Fake.DotNet.Testing
1834
open Fake.Tools
19-
open Fake.Api
20-
open Fake.Tools.Git
2135

2236
[<AutoOpen>]
2337
module TemporaryDocumentationHelpers =
@@ -456,7 +470,21 @@ Target.create "Release" (fun _ ->
456470
)
457471

458472
Target.create "BuildPackage" ignore
459-
Target.create "GenerateDocs" ignore
473+
474+
//Target.create "GenerateDocs" (fun _ ->
475+
// let (exitCode, messages) =
476+
// Fsi.exec
477+
// (fun p ->
478+
// { p with
479+
// WorkingDirectory="docsrc/tools"
480+
// Define="RELEASE"
481+
// }
482+
// )
483+
// "generate.fsx"
484+
// []
485+
// if exitCode = 0 then () else
486+
// failwith (messages |> String.concat Environment.NewLine)
487+
//)
460488

461489
Target.create "GitReleaseNuget" (fun _ ->
462490
let tempNugetDir = "temp/nuget"
@@ -480,16 +508,16 @@ Target.create "All" ignore
480508
==> "Build"
481509
==> "CopyBinaries"
482510
==> "RunTests"
483-
==> "GenerateDocs"
511+
//==> "GenerateDocs"
484512
==> "NuGet"
485513
==> "All"
486514

487515
"RunTests" ?=> "CleanDocs"
488516

489517
"CleanDocs"
490-
==>"Docs"
518+
==> "Docs"
491519
==> "ReferenceDocs"
492-
==> "GenerateDocs"
520+
//==> "GenerateDocs"
493521

494522
"Clean"
495523
==> "Release"
@@ -498,7 +526,7 @@ Target.create "All" ignore
498526
==> "PublishNuget"
499527
==> "Release"
500528

501-
"GenerateDocs"
529+
"Docs"
502530
==> "ReleaseDocs"
503531

504532
"All"

0 commit comments

Comments
 (0)