Skip to content

Commit bcdf53c

Browse files
committed
use .net 8
1 parent f7d24df commit bcdf53c

File tree

5 files changed

+32
-17
lines changed

5 files changed

+32
-17
lines changed

build/BasicTasks.fs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ let buildSolution =
3838
Properties = ([
3939
"warnon", "3390"
4040
])
41+
DisableInternalBinLog = true
4142
}
4243
{
4344
p with
4445
MSBuildParams = msBuildParams
46+
4547
}
48+
|> DotNet.Options.withCustomParams (Some "-tl")
4649
)
4750
}
4851

@@ -66,12 +69,13 @@ let build = BuildTask.create "Build" [clean] {
6669
"InformationalVersion", pInfo.AssemblyInformationalVersion
6770
"warnon", "3390"
6871
])
72+
DisableInternalBinLog = true
6973
}
7074
{
7175
p with
7276
MSBuildParams = msBuildParams
7377
}
74-
|> DotNet.Options.withCustomParams (Some "--no-dependencies")
78+
|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
7579
)
7680
)
7781
}

build/PackageTasks.fs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
3030
"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
3131
]
3232
@ p.MSBuildParams.Properties)
33+
DisableInternalBinLog = true
3334
}
3435
| _ ->
3536
{ p.MSBuildParams with
@@ -41,6 +42,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
4142
"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
4243
]
4344
@ p.MSBuildParams.Properties)
45+
DisableInternalBinLog = true
4446
}
4547

4648

@@ -49,7 +51,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
4951
OutputPath = Some pkgDir
5052
NoBuild = true
5153
}
52-
|> DotNet.Options.withCustomParams (Some "--no-dependencies")
54+
|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
5355
)
5456
else
5557
failwith "aborted"
@@ -84,6 +86,7 @@ let packPrerelease =
8486
"PackageReleaseNotes", (r.Notes |> String.concat "\r\n")
8587
"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
8688
])
89+
DisableInternalBinLog = true
8790
}
8891
| _ ->
8992
{ p.MSBuildParams with
@@ -94,6 +97,7 @@ let packPrerelease =
9497
"InformationalVersion", pInfo.AssemblyInformationalVersion
9598
"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
9699
])
100+
DisableInternalBinLog = true
97101
}
98102

99103
{ p with
@@ -102,7 +106,7 @@ let packPrerelease =
102106
MSBuildParams = msBuildParams
103107
NoBuild = true
104108
}
105-
|> DotNet.Options.withCustomParams (Some "--no-dependencies")
109+
|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
106110
)
107111
else
108112
failwith "aborted"

build/TestTasks.fs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ let createTestBuildTask (name: string) (deps: BuildTask.TaskInfo list) (projects
1313
let proj = pInfo.ProjFile
1414
proj
1515
|> DotNet.build (fun p ->
16-
p
17-
|> DotNet.Options.withCustomParams (Some "--no-dependencies")
16+
{
17+
p with
18+
MSBuildParams = { p.MSBuildParams with DisableInternalBinLog = true}
19+
}
20+
|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
1821
)
1922
)
2023
}
@@ -40,8 +43,12 @@ let createRunTestTask (name: string) (deps: BuildTask.TaskInfo list) (projects:
4043
Logger = Some "console;verbosity=detailed"
4144
Configuration = DotNet.BuildConfiguration.fromString configuration
4245
NoBuild = true
43-
})
44-
testProjectInfo.ProjFile)
46+
MSBuildParams = { testParams.MSBuildParams with DisableInternalBinLog = true }
47+
}
48+
|> DotNet.Options.withCustomParams (Some "-tl")
49+
)
50+
testProjectInfo.ProjFile
51+
)
4552
}
4653

4754
/// runs the all test projects via `dotnet test`

build/build.fsproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

@@ -19,14 +19,14 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="BlackFox.Fake.BuildTask" Version="0.1.3" />
22-
<PackageReference Include="Fake.Api.Github" Version="5.22.0" />
23-
<PackageReference Include="Fake.Core.Process" Version="5.22.0" />
24-
<PackageReference Include="Fake.Core.ReleaseNotes" Version="5.22.0" />
25-
<PackageReference Include="Fake.Core.Target" Version="5.22.0" />
26-
<PackageReference Include="Fake.DotNet.Cli" Version="5.22.0" />
27-
<PackageReference Include="Fake.DotNet.MSBuild" Version="5.22.0" />
28-
<PackageReference Include="Fake.IO.FileSystem" Version="5.22.0" />
29-
<PackageReference Include="Fake.Tools.Git" Version="5.22.0" />
22+
<PackageReference Include="Fake.Api.Github" Version="6.0.0" />
23+
<PackageReference Include="Fake.Core.Process" Version="6.0.0" />
24+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
25+
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
26+
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
27+
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.0.0" />
28+
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
29+
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
3030
</ItemGroup>
3131

3232
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "8.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

0 commit comments

Comments
 (0)