Merge branch 'master' into net8-build

# Conflicts: # RELEASE_NOTES.md # build.fsx # paket.lock
Thorium · Sep 23, 2024 · 49914d4 · 49914d4
2 parents c2fdfd6 + 4d0bf7d
commit 49914d4
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 35 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,9 @@
 # Release Notes
-## 6.1.2 - 2024-09-03
+## 8.0.0-alpha - 2024-09-03
 * Added .NET8.0 to package target libraries
 * Some dependency updates
+
+## 6.1.2 - 2024-09-20
 * Runtime-identifier update to more recent runtimes.
 * Removed .NETFrameworkAssembly attribute fix on detecting .NET assemblies.
 

diff --git a/build.fsx b/build.fsx
@@ -809,6 +809,7 @@ runtimes
                         Configuration = DotNet.Release
                         OutputPath = Some outDir 
                         Framework = Some "net8.0"
+                        // DisableInternalBinLog: https://github.com/fsprojects/FAKE/issues/2722
                         MSBuildParams = { MSBuild.CliArguments.Create() with DisableInternalBinLog = true }}
                     |> dotnetSimple)
                 proj
@@ -877,6 +878,7 @@ Target.create "DotNetCreateNuGetPackage" (fun _ ->
                         Properties =
                             [ ("Version", nugetVersion)
                               ("PackageReleaseNotes", release.Notes |> String.toLines) ] 
+                        // DisableInternalBinLog: https://github.com/fsprojects/FAKE/issues/2722
                         DisableInternalBinLog = true } }
             |> dotnetSimple)
         "Fake.sln"

diff --git a/paket.dependencies b/paket.dependencies
@@ -35,7 +35,6 @@ group fakerunner
 
     // Testing
     nuget Expecto
-    nuget Expecto.TestResults
     nuget Expecto.FsCheck
     nuget YoloDev.Expecto.TestSdk
     nuget Microsoft.TestPlatform.TestHost

diff --git a/paket.lock b/paket.lock
diff --git a/src/app/Fake.Core.CommandLineParsing/docopt.fs/Docopt/Ast.fs b/src/app/Fake.Core.CommandLineParsing/docopt.fs/Docopt/Ast.fs
@@ -93,19 +93,19 @@ type UsageAstBuilder =
 
     member x.UsageTag =
         match x with
-        | UsageAstBuilder.Eps _ -> Tag.Eps
+        | UsageAstBuilder.Eps -> Tag.Eps
         | UsageAstBuilder.Ano _ -> Tag.Ano
         | UsageAstBuilder.Sop _ -> Tag.Sop
         | UsageAstBuilder.Lop _ -> Tag.Lop
         | UsageAstBuilder.Sqb _ -> Tag.Sqb
         | UsageAstBuilder.Req _ -> Tag.Req
         | UsageAstBuilder.Arg _ -> Tag.Arg
-        | UsageAstBuilder.XorEmpty _ -> Tag.Xor
+        | UsageAstBuilder.XorEmpty -> Tag.Xor
         | UsageAstBuilder.Xor _ -> Tag.Xor
         | UsageAstBuilder.Seq _ -> Tag.Seq
         | UsageAstBuilder.Cmd _ -> Tag.Cmd
         | UsageAstBuilder.Ell _ -> Tag.Ell
-        | UsageAstBuilder.Sdh _ -> Tag.Sdh
+        | UsageAstBuilder.Sdh -> Tag.Sdh
 
 and UsageAstCell =
     { mutable Content: UsageAstBuilder option }

diff --git a/src/app/Fake.DotNet.AssemblyInfoFile/AssemblyInfoFile.fs b/src/app/Fake.DotNet.AssemblyInfoFile/AssemblyInfoFile.fs
@@ -360,15 +360,15 @@ module AssemblyInfoFile =
             |> Seq.tryFind (fun (attr: Attribute) -> attr.Name = "AssemblyVersion")
         with
         | Some attr -> attr.Value
-        | None _ -> "\"" + BuildServer.buildVersion + "\""
+        | None -> "\"" + BuildServer.buildVersion + "\""
 
     let private getAssemblyInformationalVersion attributes =
         match
             attributes
             |> Seq.tryFind (fun (attr: Attribute) -> attr.Name = "AssemblyInformationalVersion")
         with
         | Some attr -> attr.Value
-        | None _ -> getAssemblyVersionInfo attributes
+        | None -> getAssemblyVersionInfo attributes
 
     let private getSortedAndNumberedAttributes (attrs: seq<Attribute>) =
         attrs

diff --git a/src/test/Fake.Core.CommandLine.UnitTests/paket.references b/src/test/Fake.Core.CommandLine.UnitTests/paket.references
@@ -5,5 +5,4 @@ Microsoft.TestPlatform.TestHost
 FSharp.Core
 NETStandard.Library
 Expecto
-Expecto.TestResults
 FParsec
diff --git a/src/test/Fake.Core.IntegrationTests/paket.references b/src/test/Fake.Core.IntegrationTests/paket.references
@@ -5,6 +5,5 @@ Microsoft.TestPlatform.TestHost
 FSharp.Core
 NETStandard.Library
 Expecto
-Expecto.TestResults
 FParsec
 Newtonsoft.Json
diff --git a/src/test/Fake.Core.UnitTests/paket.references b/src/test/Fake.Core.UnitTests/paket.references
@@ -6,6 +6,5 @@ Paket.Core
 FSharp.Core
 NETStandard.Library
 Expecto
-Expecto.TestResults
 Expecto.FsCheck
 FsCheck
diff --git a/src/test/Fake.DotNet.Cli.IntegrationTests/paket.references b/src/test/Fake.DotNet.Cli.IntegrationTests/paket.references
@@ -5,4 +5,3 @@ Microsoft.TestPlatform.TestHost
 FSharp.Core
 NETStandard.Library
 Expecto
-Expecto.TestResults
diff --git a/src/test/Fake.ExpectoSupport/paket.references b/src/test/Fake.ExpectoSupport/paket.references
@@ -2,6 +2,5 @@ group fakerunner
 
 FSharp.Core
 Expecto
-Expecto.TestResults
 Expecto.FsCheck
 FsCheck