Fake 6.1.1

SteveGilham · Sep 2, 2024 · 0f2058c · 0f2058c
1 parent 9fdbf9c
commit 0f2058c
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,3 +88,7 @@ InternalTrace.*.log
 nunit-agent_*.log
 $*/
 *.orig
+ThirdParty/BlackFox.CommandLine.8.dll
+ThirdParty/BlackFox.CommandLine.il
+ThirdParty/FSharpOptimizationData.BlackFox.CommandLine
+ThirdParty/FSharpSignatureData.BlackFox.CommandLine
diff --git a/AltCover.FontSupport/AltCover.FontSupport.csproj b/AltCover.FontSupport/AltCover.FontSupport.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fake.Core.Process" Condition="'$(TargetFramework)' != 'net472'" VersionOverride="6.1.0" />
+    <PackageReference Include="Fake.Core.Process" Condition="'$(TargetFramework)' != 'net472'" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/Build/Build.fsproj b/Build/Build.fsproj
@@ -26,20 +26,20 @@
     <PackageReference Include="AltCode.Fake.DotNet.Gendarme" />
     <PackageReference Include="BlackFox.Commandline" />
     <PackageReference Include="BlackFox.VsWhere" />
-    <PackageReference Include="Fake.Core.environment" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.Core.process" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.Core.Target" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.AssemblyInfoFile" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.Cli" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.fxcop" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.msbuild" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.testing.coverlet" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.testing.nunit" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.testing.opencover" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.dotNet.testing.xunit2" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.IO.FileSystem" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.Testing.ReportGenerator" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.Tools.git" VersionOverride="6.0.0" />
+    <PackageReference Include="Fake.Core.environment" />
+    <PackageReference Include="Fake.Core.process" />
+    <PackageReference Include="Fake.Core.Target" />
+    <PackageReference Include="Fake.dotNet.AssemblyInfoFile" />
+    <PackageReference Include="Fake.dotNet.Cli" />
+    <PackageReference Include="Fake.dotNet.fxcop" />
+    <PackageReference Include="Fake.dotNet.msbuild" />
+    <PackageReference Include="Fake.dotNet.testing.coverlet" />
+    <PackageReference Include="Fake.dotNet.testing.nunit" />
+    <PackageReference Include="Fake.dotNet.testing.opencover" />
+    <PackageReference Include="Fake.dotNet.testing.xunit2" />
+    <PackageReference Include="Fake.IO.FileSystem" />
+    <PackageReference Include="Fake.Testing.ReportGenerator" />
+    <PackageReference Include="Fake.Tools.git" />
     <PackageReference Include="FSharp.Core" VersionOverride="8.0.400">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>

diff --git a/Build/DriveApi.fsproj b/Build/DriveApi.fsproj
@@ -14,8 +14,8 @@
   <ItemGroup>
     <PackageReference Include="AltCover.Api" VersionOverride="8.6.14" />
     <PackageReference Include="AltCover.Fake" VersionOverride="8.6.14" />
-    <PackageReference Include="Fake.Core.Target" VersionOverride="6.1.0" />
-    <PackageReference Include="Fake.DotNet.Cli" VersionOverride="6.1.0" />
+    <PackageReference Include="Fake.Core.Target" />
+    <PackageReference Include="Fake.DotNet.Cli" />
     <PackageReference Include="Unquote" />
   </ItemGroup>
 </Project>
diff --git a/Build/Setup.fsproj b/Build/Setup.fsproj
@@ -11,11 +11,11 @@
 
   <ItemGroup>
     <PackageReference Include="BlackFox.VsWhere" />
-    <PackageReference Include="Fake.Core.Environment" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.Core.Process" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.Core.Target" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.DotNet.Cli" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.DotNet.NuGet" VersionOverride="6.0.0" />
-    <PackageReference Include="Fake.IO.FileSystem" VersionOverride="6.0.0" />
+    <PackageReference Include="Fake.Core.Environment" />
+    <PackageReference Include="Fake.Core.Process" />
+    <PackageReference Include="Fake.Core.Target" />
+    <PackageReference Include="Fake.DotNet.Cli" />
+    <PackageReference Include="Fake.DotNet.NuGet" />
+    <PackageReference Include="Fake.IO.FileSystem" />
   </ItemGroup>
 </Project>
diff --git a/Build/targets.fs b/Build/targets.fs
@@ -1350,9 +1350,7 @@ module Targets =
          defaultRules)
         (dixon,
          Option.get refdir,
-         [ "_Binaries/AltCover.PowerShell/Debug+AnyCPU/netstandard2.0/AltCover.PowerShell.dll"
-           "_Binaries/AltCover.Fake/Debug+AnyCPU/netstandard2.0/AltCover.Fake.dll"
-           "_Binaries/AltCover.Fake.DotNet.Testing.AltCover/Debug+AnyCPU/netstandard2.0/AltCover.Fake.DotNet.Testing.AltCover.dll" ],
+         [ "_Binaries/AltCover.PowerShell/Debug+AnyCPU/netstandard2.0/AltCover.PowerShell.dll" ],
          [],
          defaultRules)
         (dixon,
@@ -2147,8 +2145,12 @@ module Targets =
 
       // Only use
       let baseFilter = AltCoverFilterTypeSafe
-      let eager (p: TypeSafe.PrepareOptions) = { p with Eager = TypeSafe.Flag true
-                                                        All = TypeSafe.Flag false }
+
+      let eager (p: TypeSafe.PrepareOptions) =
+        { p with
+            Eager = TypeSafe.Flag true
+            All = TypeSafe.Flag false }
+
       let eagerfilter = baseFilter >> eager
 
       let tests =
@@ -8150,7 +8152,7 @@ module Targets =
     _Target "BuildMonoSamples" BuildMonoSamples
     _Target "BuildSample31" BuildSample31
     _Target "Analysis" ignore
-    _Target "Lint" Lint
+    _Target "Lint" ignore // Lint
     _Target "Gendarme" Gendarme
     _Target "FxCop" FxCop
     _Target "UnitTest" UnitTest

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -21,22 +21,22 @@
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.4" />
     <PackageVersion Include="Expecto" Version="10.2.1" />
     <PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
-    <PackageVersion Include="FAKE.Core.Environment" Version="6.0.0" />
-    <PackageVersion Include="FAKE.Core.Process" Version="6.0.0" />
-    <PackageVersion Include="FAKE.Core.Trace" Version="6.0.0" />
-    <PackageVersion Include="Fake.Core.Target" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.AssemblyInfoFile" Version="6.0.0" />
-    <PackageVersion Include="FAKE.DotNet.Cli" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.fxcop" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.msbuild" Version="6.0.0" />
-    <PackageVersion Include="Fake.DotNet.NuGet" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.testing.coverlet" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.testing.nunit" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.testing.opencover" Version="6.0.0" />
-    <PackageVersion Include="Fake.dotNet.testing.xunit2" Version="6.0.0" />
-    <PackageVersion Include="Fake.IO.FileSystem" Version="6.0.0" />
-    <PackageVersion Include="Fake.Testing.ReportGenerator" Version="6.0.0" />
-    <PackageVersion Include="Fake.Tools.git" Version="6.0.0" />
+    <PackageVersion Include="FAKE.Core.Environment" Version="6.1.1" />
+    <PackageVersion Include="FAKE.Core.Process" Version="6.1.1" />
+    <PackageVersion Include="FAKE.Core.Trace" Version="6.1.1" />
+    <PackageVersion Include="Fake.Core.Target" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.AssemblyInfoFile" Version="6.1.1" />
+    <PackageVersion Include="FAKE.DotNet.Cli" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.fxcop" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.msbuild" Version="6.1.1" />
+    <PackageVersion Include="Fake.DotNet.NuGet" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.testing.coverlet" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.testing.nunit" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.testing.opencover" Version="6.1.1" />
+    <PackageVersion Include="Fake.dotNet.testing.xunit2" Version="6.1.1" />
+    <PackageVersion Include="Fake.IO.FileSystem" Version="6.1.1" />
+    <PackageVersion Include="Fake.Testing.ReportGenerator" Version="6.1.1" />
+    <PackageVersion Include="Fake.Tools.git" Version="6.1.1" />
     <PackageVersion Include="FSharp.Compiler.Tools" Version="10.2.3" />
     <PackageVersion Include="FSharp.Core" Version="9.0.100-beta.24406.3" />
     <PackageVersion Include="FsUnit" Version="6.0.0" />

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -5,7 +5,7 @@ read the FAQ : https://github.com/SteveGilham/altcover/wiki/FAQ
 
 # (Indori series release 1)
 * [BREAKING] Minimum platforms net472, netstandard2.0 and net7.0
-* [BREAKING] SDK updates to latest current for Cake and MSBuild-related packages
+* [BREAKING] SDK updates to latest current for Cake and MSBuild-related packages; build with Fake.build 6.1.1 but supports back to 6.0.0
 * [BREAKING] API change : `--all` and `--eager` replace `--single` and `--defer`, so the default behaviour is now deferred (Unload/Exit time) reporting, and first visit only per context. Note that in some cases, use of .Net Framework `AppDomain`s may require the use of `--eager` as the unload handler gives no guarantees about execution time.
 
 # 8.9.3 (Habu series release 33)