Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
"paket"
]
},
"fake-cli": {
"version": "6.1.3",
"commands": [
"fake"
]
},
"fsdocs-tool": {
"version": "19.1.1",
"commands": [
Expand All @@ -27,4 +21,4 @@
]
}
}
}
}
7 changes: 2 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,11 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
# FAKE 6 needs the .NET 6 SDK alongside the .NET 8 project SDK.
dotnet-version: |
6.0.428
${{ matrix.dotnet }}
dotnet-version: ${{ matrix.dotnet }}

- name: Install local tools
run: dotnet tool restore
- name: Paket Restore
run: dotnet paket restore
- name: Build and Test
run: dotnet fake run build.fsx
run: dotnet run --project build/build.fsproj
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ _ReSharper*/
# Build Output
pkg
[Bb]uild
!/build/


# ===================================================
Expand Down Expand Up @@ -114,4 +115,4 @@ FsUnit.Xunit.Test.dll.xunit.html
NUnit.xml
xunit.html

release.sh
release.sh
1 change: 0 additions & 1 deletion FsUnit.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{35F65EEF-9059-4829-93EE-C8F7810B3997}"
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
build.fsx = build.fsx
build.sh = build.sh
paket.dependencies = paket.dependencies
paket.lock = paket.lock
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ cls

dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx %*
dotnet run --project build/build.fsproj -- %*
263 changes: 0 additions & 263 deletions build.fsx.lock

This file was deleted.

2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx $@
dotnet run --project build/build.fsproj -- "$@"
28 changes: 9 additions & 19 deletions build.fsx → build/build.fs
Original file line number Diff line number Diff line change
@@ -1,20 +1,4 @@
#r @"paket:
source https://api.nuget.org/v3/index.json
framework: net6.0
nuget FSharp.Core 6.0.0.0
nuget Fake.Core.Target
nuget Fake.Core.Trace
nuget Fake.Core.ReleaseNotes
nuget Fake.IO.FileSystem
nuget Fake.DotNet.Cli
nuget Fake.DotNet.MSBuild
nuget Fake.DotNet.AssemblyInfoFile
nuget Fake.DotNet.Paket
nuget Fake.DotNet.Fsi
nuget Fake.Tools.Git
nuget Fake.Api.GitHub //"

#load "./.fake/build.fsx/intellisense.fsx"
module Build

open Fake.Core
open Fake.Core.TargetOperators
Expand All @@ -25,7 +9,8 @@
open Fake.Tools.Git
open System.IO

Target.initEnvironment()
let execContext = Context.FakeExecutionContext.Create false "build.fs" []
Context.setExecutionContext (Context.RuntimeContext.Fake execContext)

// --------------------------------------------------------------------------------------
// Project-specific details below
Expand Down Expand Up @@ -220,7 +205,7 @@
Shell.cleanDir tempDocsDir
Repository.cloneSingleBranch "" cloneUrl "gh-pages" tempDocsDir

Repository.fullclean tempDocsDir

Check warning on line 208 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 8.0.425)

This construct is deprecated. Please use fullClean instead. This method will be removed in FAKE next major release

Check warning on line 208 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest, 8.0.425)

This construct is deprecated. Please use fullClean instead. This method will be removed in FAKE next major release

Check warning on line 208 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest, 8.0.425)

This construct is deprecated. Please use fullClean instead. This method will be removed in FAKE next major release
Shell.copyRecursive "output" tempDocsDir true |> Trace.tracefn "%A"
Staging.stageAll tempDocsDir
Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" version)
Expand All @@ -232,7 +217,7 @@
Target.create "All" ignore
Target.create "Release" ignore

"Clean"

Check warning on line 220 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 220 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 220 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.
==> "AssemblyInfo"
==> "CheckFormat"
==> "Build"
Expand All @@ -240,16 +225,21 @@
==> "RunTests"
==> "All"

"Build"

Check warning on line 228 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 228 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 228 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.
==> "NUnit"
==> "xUnit"
==> "MsTest"
==> "RunTests"

"All"

Check warning on line 234 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 234 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (windows-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.

Check warning on line 234 in build/build.fs

View workflow job for this annotation

GitHub Actions / build (macOS-latest, 8.0.425)

The result of this expression has type 'string' and is implicitly ignored. Consider using 'ignore' to discard this value explicitly, e.g. 'expr |> ignore', or 'let' to bind the result to a name, e.g. 'let result = expr'.
==> "NuGet"
==> "GenerateDocs"
==> "ReleaseDocs"
==> "Release"

Target.runOrDefault "All"
[<EntryPoint>]
let main args =
match args with
| [| target |] -> Target.runOrDefault target
| _ -> Target.runOrDefault "All"
0
Loading
Loading