Skip to content

Commit 698604d

Browse files
committed
Merge branch 'develop/maintenance' into release/v2
2 parents f041c1f + a971e3d commit 698604d

19 files changed

Lines changed: 819 additions & 755 deletions

File tree

.config/dotnet-tools.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-reportgenerator-globaltool": {
6-
"version": "5.1.12",
6+
"version": "5.2.0",
77
"commands": [
88
"reportgenerator"
99
]
1010
},
1111
"dotnet-fsharplint": {
12-
"version": "0.21.3",
12+
"version": "0.23.6",
1313
"commands": [
1414
"dotnet-fsharplint"
1515
]
16+
},
17+
"coveralls.net": {
18+
"version": "4.0.1",
19+
"commands": [
20+
"csmacnz.Coveralls"
21+
]
1622
}
1723
}
1824
}

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@ jobs:
1414
windows:
1515
runs-on: windows-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 2
20-
- uses: actions/setup-dotnet@v3
20+
- uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '7.0.100'
22+
dotnet-version: '8.0.100'
2323
- name: Tools
2424
run: dotnet tool restore
2525
- name: Setup
2626
run: dotnet run --project ./Build/Setup.fsproj
2727
- name: Build
2828
env:
29-
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
29+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
3030
NUGET_API_TOKEN: ${{ secrets.NUGET_API_TOKEN }}
3131
run: dotnet run --project ./Build/Build.fsproj
32-
- uses: actions/upload-artifact@v3
32+
- uses: actions/upload-artifact@v4
3333
with:
3434
name: nupkgs
3535
path: _Packagin*/*.nupkg
3636
linux:
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v3
40-
- uses: actions/setup-dotnet@v3
39+
- uses: actions/checkout@v4
40+
- uses: actions/setup-dotnet@v4
4141
with:
42-
dotnet-version: '7.0.100'
42+
dotnet-version: '7.0.400'
4343
- name: Tools
4444
run: dotnet tool restore
4545
- name: Setup

Build/build.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ module Build =
2626
Targets.initTargets ()
2727
Target.runOrDefault <| Targets.defaultTarget ()
2828

29-
0 // return an integer exit code
29+
0

Build/setup.fs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ module Setup =
1818
"dotnet"
1919
|> Fake.Core.ProcessUtils.tryFindFileOnPath
2020

21+
let cliArguments =
22+
{ MSBuild.CliArguments.Create() with
23+
ConsoleLogParameters = []
24+
DistributedLoggers = None
25+
Properties = []
26+
DisableInternalBinLog = true }
27+
2128
let dotnetOptions (o: DotNet.Options) =
2229
match dotnetPath with
2330
| Some f -> { o with DotNetCliPath = f }
@@ -27,5 +34,6 @@ module Setup =
2734
(fun o ->
2835
{ o with
2936
Packages = [ "./packages" ]
37+
MSBuildParams = cliArguments
3038
Common = dotnetOptions o.Common })
3139
"./Build/NuGet.csproj"

0 commit comments

Comments
 (0)