use .net 8

kMutagene · kMutagene · commit bcdf53c7c6fc · 2023-12-11T10:58:16.000+01:00
diff --git a/build/BasicTasks.fs b/build/BasicTasks.fs
@@ -38,11 +38,14 @@ let buildSolution =
                     Properties = ([
                         "warnon", "3390"
                     ])
+                    DisableInternalBinLog = true
                 }
             {
                 p with 
                     MSBuildParams = msBuildParams
+                    
             }
+            |> DotNet.Options.withCustomParams (Some "-tl")
         )
     }
 
@@ -66,12 +69,13 @@ let build = BuildTask.create "Build" [clean] {
                         "InformationalVersion", pInfo.AssemblyInformationalVersion
                         "warnon", "3390"
                     ])
+                    DisableInternalBinLog = true
                 }
             {
                 p with 
                     MSBuildParams = msBuildParams
             }
-            |> DotNet.Options.withCustomParams (Some "--no-dependencies")
+            |> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
         )
     )
 }
diff --git a/build/PackageTasks.fs b/build/PackageTasks.fs
@@ -30,6 +30,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
                                     "TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
                                     ]
                                     @ p.MSBuildParams.Properties)
+                            DisableInternalBinLog = true
                         }
                     | _ ->
                         { p.MSBuildParams with
@@ -41,6 +42,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
                                     "TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
                                     ]
                                     @ p.MSBuildParams.Properties)
+                            DisableInternalBinLog = true
                         }
                         
 
@@ -49,7 +51,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {
                     OutputPath = Some pkgDir
                     NoBuild = true
                 }
-                |> DotNet.Options.withCustomParams (Some "--no-dependencies")
+                |> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
             )
         else
             failwith "aborted"
@@ -84,6 +86,7 @@ let packPrerelease =
                                         "PackageReleaseNotes",  (r.Notes |> String.concat "\r\n")
                                         "TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
                                         ])
+                                DisableInternalBinLog = true
                             }
                         | _ -> 
                             { p.MSBuildParams with
@@ -94,6 +97,7 @@ let packPrerelease =
                                         "InformationalVersion", pInfo.AssemblyInformationalVersion
                                         "TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320
                                         ])
+                                DisableInternalBinLog = true
                             }
 
                     { p with
@@ -102,7 +106,7 @@ let packPrerelease =
                         MSBuildParams = msBuildParams
                         NoBuild = true
                     }
-                    |> DotNet.Options.withCustomParams (Some "--no-dependencies")
+                    |> DotNet.Options.withCustomParams (Some "--no-dependencies  -tl")
                 )
             else
                 failwith "aborted"
diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -13,8 +13,11 @@ let createTestBuildTask (name: string) (deps: BuildTask.TaskInfo list) (projects
             let proj = pInfo.ProjFile
             proj
             |> DotNet.build (fun p ->
-                p
-                |> DotNet.Options.withCustomParams (Some "--no-dependencies")
+                {
+                    p with
+                        MSBuildParams = { p.MSBuildParams with DisableInternalBinLog = true}
+                }
+                |> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")
             )
         )
     }
@@ -40,8 +43,12 @@ let createRunTestTask (name: string) (deps: BuildTask.TaskInfo list) (projects:
                         Logger = Some "console;verbosity=detailed"
                         Configuration = DotNet.BuildConfiguration.fromString configuration
                         NoBuild = true
-                    })
-                testProjectInfo.ProjFile)
+                        MSBuildParams = { testParams.MSBuildParams with DisableInternalBinLog = true }
+                    }
+                    |> DotNet.Options.withCustomParams (Some "-tl")
+                )
+                testProjectInfo.ProjFile
+        )
     }
 
 /// runs the all test projects via `dotnet test`
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
@@ -19,14 +19,14 @@
 
   <ItemGroup>
     <PackageReference Include="BlackFox.Fake.BuildTask" Version="0.1.3" />
-    <PackageReference Include="Fake.Api.Github" Version="5.22.0" />
-    <PackageReference Include="Fake.Core.Process" Version="5.22.0" />
-    <PackageReference Include="Fake.Core.ReleaseNotes" Version="5.22.0" />
-    <PackageReference Include="Fake.Core.Target" Version="5.22.0" />
-    <PackageReference Include="Fake.DotNet.Cli" Version="5.22.0" />
-    <PackageReference Include="Fake.DotNet.MSBuild" Version="5.22.0" />
-    <PackageReference Include="Fake.IO.FileSystem" Version="5.22.0" />
-    <PackageReference Include="Fake.Tools.Git" Version="5.22.0" />
+    <PackageReference Include="Fake.Api.Github" Version="6.0.0" />
+    <PackageReference Include="Fake.Core.Process" Version="6.0.0" />
+    <PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
+    <PackageReference Include="Fake.Core.Target" Version="6.0.0" />
+    <PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
+    <PackageReference Include="Fake.DotNet.MSBuild" Version="6.0.0" />
+    <PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
+    <PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "6.0.100",
+      "version": "8.0.100",
       "rollForward": "latestMinor"
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,14 @@ let buildSolution =`
`38`	`38`	`Properties = ([`
`39`	`39`	`"warnon", "3390"`
`40`	`40`	`])`
	`41`	`+ DisableInternalBinLog = true`
`41`	`42`	`}`
`42`	`43`	`{`
`43`	`44`	`p with`
`44`	`45`	`MSBuildParams = msBuildParams`
	`46`	`+`
`45`	`47`	`}`
	`48`	`+ \|> DotNet.Options.withCustomParams (Some "-tl")`
`46`	`49`	`)`
`47`	`50`	`}`
`48`	`51`
`@@ -66,12 +69,13 @@ let build = BuildTask.create "Build" [clean] {`
`66`	`69`	`"InformationalVersion", pInfo.AssemblyInformationalVersion`
`67`	`70`	`"warnon", "3390"`
`68`	`71`	`])`
	`72`	`+ DisableInternalBinLog = true`
`69`	`73`	`}`
`70`	`74`	`{`
`71`	`75`	`p with`
`72`	`76`	`MSBuildParams = msBuildParams`
`73`	`77`	`}`
`74`		`- \|> DotNet.Options.withCustomParams (Some "--no-dependencies")`
	`78`	`+ \|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")`
`75`	`79`	`)`
`76`	`80`	`)`
`77`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {`
`30`	`30`	`"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320`
`31`	`31`	`]`
`32`	`32`	`@ p.MSBuildParams.Properties)`
	`33`	`+ DisableInternalBinLog = true`
`33`	`34`	`}`
`34`	`35`	`\| _ ->`
`35`	`36`	`{ p.MSBuildParams with`
`@@ -41,6 +42,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {`
`41`	`42`	`"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320`
`42`	`43`	`]`
`43`	`44`	`@ p.MSBuildParams.Properties)`
	`45`	`+ DisableInternalBinLog = true`
`44`	`46`	`}`
`45`	`47`
`46`	`48`
`@@ -49,7 +51,7 @@ let pack = BuildTask.create "Pack" [ clean; build; runTestsAll ] {`
`49`	`51`	`OutputPath = Some pkgDir`
`50`	`52`	`NoBuild = true`
`51`	`53`	`}`
`52`		`- \|> DotNet.Options.withCustomParams (Some "--no-dependencies")`
	`54`	`+ \|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")`
`53`	`55`	`)`
`54`	`56`	`else`
`55`	`57`	`failwith "aborted"`
`@@ -84,6 +86,7 @@ let packPrerelease =`
`84`	`86`	`"PackageReleaseNotes", (r.Notes \|> String.concat "\r\n")`
`85`	`87`	`"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320`
`86`	`88`	`])`
	`89`	`+ DisableInternalBinLog = true`
`87`	`90`	`}`
`88`	`91`	`\| _ ->`
`89`	`92`	`{ p.MSBuildParams with`
`@@ -94,6 +97,7 @@ let packPrerelease =`
`94`	`97`	`"InformationalVersion", pInfo.AssemblyInformationalVersion`
`95`	`98`	`"TargetsForTfmSpecificContentInPackage", "" //https://github.com/dotnet/fsharp/issues/12320`
`96`	`99`	`])`
	`100`	`+ DisableInternalBinLog = true`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`{ p with`
`@@ -102,7 +106,7 @@ let packPrerelease =`
`102`	`106`	`MSBuildParams = msBuildParams`
`103`	`107`	`NoBuild = true`
`104`	`108`	`}`
`105`		`- \|> DotNet.Options.withCustomParams (Some "--no-dependencies")`
	`109`	`+ \|> DotNet.Options.withCustomParams (Some "--no-dependencies -tl")`
`106`	`110`	`)`
`107`	`111`	`else`
`108`	`112`	`failwith "aborted"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.100",`
	`3`	`+ "version": "8.0.100",`
`4`	`4`	`"rollForward": "latestMinor"`
`5`	`5`	`}`
`6`	`6`	`}`