From 6dba7941e908ca0662c34b2693e84aa88f6bf3de Mon Sep 17 00:00:00 2001 From: SteveGilham Date: Wed, 13 Nov 2024 12:07:52 +0000 Subject: [PATCH] Absolute minimum for net9.0 --- .config/dotnet-tools.json | 2 +- .github/workflows/main.yml | 4 +- AltCover.Avalonia/AltCover.Avalonia.fsproj | 2 +- AltCover.Avalonia/AltCover.Avalonia11.fsproj | 6 +- AltCover.Cake/AltCover.Cake.csproj | 2 +- AltCover.Engine/Main.fs | 2 +- AltCover.Tests/Tests.fs | 2 +- AltCover.ValidateGendarmeEmulation/Tests.fs | 2 +- .../AltCover.Visualizer3.fsproj | 4 +- AltCover/AltCover.fsproj | 10 +- Build/DriveApi.fsproj | 2 +- Build/merge-coverage.ps1 | 2 +- Build/msbuildtest.proj | 4 +- Build/targets.fs | 207 +++++++++--------- Directory.Packages.props | 18 +- RegressionTesting/issue37/issue37.xml | 2 +- ReleaseNotes.md | 4 +- global.json | 2 +- nupkg/build/AltCover.targets | 2 +- 19 files changed, 141 insertions(+), 138 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 893bf02a..b410b2d0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-reportgenerator-globaltool": { - "version": "5.3.11", + "version": "5.4.0", "commands": [ "reportgenerator" ], diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 630a50a2..85d42a2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.100-rc.2.24474.11' + dotnet-version: '9.0.100' - name: Tools run: dotnet tool restore - name: Setup @@ -63,7 +63,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.100-rc.2.24474.11' + dotnet-version: '9.0.100' - name: Tools run: dotnet tool restore - name: Setup diff --git a/AltCover.Avalonia/AltCover.Avalonia.fsproj b/AltCover.Avalonia/AltCover.Avalonia.fsproj index c5429078..e04a353c 100644 --- a/AltCover.Avalonia/AltCover.Avalonia.fsproj +++ b/AltCover.Avalonia/AltCover.Avalonia.fsproj @@ -2,7 +2,7 @@ WinExe - net7.0 + net8.0 AltCover.Visualizer AltCover.Visualizer True diff --git a/AltCover.Avalonia/AltCover.Avalonia11.fsproj b/AltCover.Avalonia/AltCover.Avalonia11.fsproj index d5e46a49..d5bf101b 100644 --- a/AltCover.Avalonia/AltCover.Avalonia11.fsproj +++ b/AltCover.Avalonia/AltCover.Avalonia11.fsproj @@ -2,7 +2,7 @@ WinExe - net7.0 + net8.0 AltCover.Visualizer AltCover.Visualizer True @@ -28,10 +28,10 @@ AltCover.App.xaml - + AltCover.AboutBox.xaml - + diff --git a/AltCover.Cake/AltCover.Cake.csproj b/AltCover.Cake/AltCover.Cake.csproj index f935497d..5220e75c 100644 --- a/AltCover.Cake/AltCover.Cake.csproj +++ b/AltCover.Cake/AltCover.Cake.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 false AltCover.Cake AltCover.Cake diff --git a/AltCover.Engine/Main.fs b/AltCover.Engine/Main.fs index ad62ebb6..07ed42b7 100644 --- a/AltCover.Engine/Main.fs +++ b/AltCover.Engine/Main.fs @@ -814,7 +814,7 @@ module internal Main = Assembly.GetExecutingAssembly().Location |> Path.GetDirectoryName - [ "../net7.0" + [ "../net8.0" "../netstandard2.0" "../any" ] |> Seq.map (fun d -> diff --git a/AltCover.Tests/Tests.fs b/AltCover.Tests/Tests.fs index 9a450f01..22a89811 100644 --- a/AltCover.Tests/Tests.fs +++ b/AltCover.Tests/Tests.fs @@ -5997,7 +5997,7 @@ module AltCoverTests = let path = Path.Combine( SolutionDir(), - "_Binaries/AltCover/Debug+AnyCPU/net7.0/AltCover.Engine.dll" + "_Binaries/AltCover/Debug+AnyCPU/net8.0/AltCover.Engine.dll" ) Visitor.visit diff --git a/AltCover.ValidateGendarmeEmulation/Tests.fs b/AltCover.ValidateGendarmeEmulation/Tests.fs index 8e298633..f9d98a83 100644 --- a/AltCover.ValidateGendarmeEmulation/Tests.fs +++ b/AltCover.ValidateGendarmeEmulation/Tests.fs @@ -38,7 +38,7 @@ module ValidateGendarmeEmulation = let path = Path.Combine( SolutionRoot.location, - "_Binaries/AltCover/Debug+AnyCPU/net7.0/AltCover.Engine.dll" + "_Binaries/AltCover/Debug+AnyCPU/net8.0/AltCover.Engine.dll" ) let def = diff --git a/AltCover.Visualizer/AltCover.Visualizer3.fsproj b/AltCover.Visualizer/AltCover.Visualizer3.fsproj index 1b72520c..267619a7 100644 --- a/AltCover.Visualizer/AltCover.Visualizer3.fsproj +++ b/AltCover.Visualizer/AltCover.Visualizer3.fsproj @@ -2,7 +2,7 @@ WinExe - net7.0 + net8.0 AltCover.Visualizer AltCover.Visualizer True @@ -29,7 +29,7 @@ - + diff --git a/AltCover/AltCover.fsproj b/AltCover/AltCover.fsproj index b7e20866..05bf2a5d 100644 --- a/AltCover/AltCover.fsproj +++ b/AltCover/AltCover.fsproj @@ -2,10 +2,10 @@ Exe - net7.0;netstandard2.0;net472 - net7.0;net472 - altcover - True + net8.0;netstandard2.0;net472 + net8.0;net472 + altcover + True AltCover AltCover AltCover.ico @@ -25,7 +25,7 @@ TRACE;GLOBALTOOL - + PreserveNewest diff --git a/Build/DriveApi.fsproj b/Build/DriveApi.fsproj index fcc5f640..72a805c4 100644 --- a/Build/DriveApi.fsproj +++ b/Build/DriveApi.fsproj @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/Build/merge-coverage.ps1 b/Build/merge-coverage.ps1 index 358a6310..f701289c 100644 --- a/Build/merge-coverage.ps1 +++ b/Build/merge-coverage.ps1 @@ -1,4 +1,4 @@ -Import-Module "./_Packaging/Unpack/tools/net7.0/AltCover.PowerShell.dll" +Import-Module "./_Packaging/Unpack/tools/net8.0/AltCover.PowerShell.dll" $files = ("_Reports/UnitTestWithAltCoverCoreRunner.xml", diff --git a/Build/msbuildtest.proj b/Build/msbuildtest.proj index 9c21a861..519f3545 100644 --- a/Build/msbuildtest.proj +++ b/Build/msbuildtest.proj @@ -1,8 +1,8 @@ + AssemblyFile="$(MSBuildThisFileDirectory)../_Packaging/Unpack/tools/net8.0/AltCover.Engine.dll" /> + AssemblyFile="$(MSBuildThisFileDirectory)../_Packaging/Unpack/tools/net8.0/AltCover.Engine.dll" /> diff --git a/Build/targets.fs b/Build/targets.fs index 2290fc0c..14122d90 100644 --- a/Build/targets.fs +++ b/Build/targets.fs @@ -1113,7 +1113,7 @@ module Targets = [ "$Binaries/Setup/Debug+AnyCPU/net9.0/Setup.dll" "$Binaries/Build/Debug+AnyCPU/net9.0/Build.dll" ]) ("./Build/common-rules.xml", - [ "_Binaries/AltCover/Debug+AnyCPU/net7.0/AltCover.dll" + [ "_Binaries/AltCover/Debug+AnyCPU/net8.0/AltCover.dll" "_Binaries/AltCover.Recorder/Debug+AnyCPU/net20/AltCover.Recorder.dll" "_Binaries/AltCover.Async/Debug+AnyCPU/net46/AltCover.Async.dll" "_Binaries/AltCover.PowerShell/Debug+AnyCPU/netstandard2.0/AltCover.PowerShell.dll" @@ -1121,16 +1121,16 @@ module Targets = "_Binaries/AltCover.DotNet/Debug+AnyCPU/netstandard2.0/AltCover.DotNet.dll" "_Binaries/AltCover.Toolkit/Debug+AnyCPU/netstandard2.0/AltCover.Toolkit.dll" "_Binaries/AltCover.UICommon/Debug+AnyCPU/netstandard2.0/AltCover.UICommon.dll" - "_Binaries/AltCover.Visualizer3/Debug+AnyCPU/net7.0/AltCover.Visualizer.dll" // GTK3 (obsolete) - "_Binaries/AltCover.Cake/Debug+AnyCPU/net7.0/AltCover.Cake.dll" // Cake 2+ + "_Binaries/AltCover.Visualizer3/Debug+AnyCPU/net8.0/AltCover.Visualizer.dll" // GTK3 (obsolete) + "_Binaries/AltCover.Cake/Debug+AnyCPU/net8.0/AltCover.Cake.dll" // Cake 2+ "_Binaries/AltCover.Fake.DotNet.Testing.AltCover/Debug+AnyCPU/netstandard2.0/AltCover.Fake.DotNet.Testing.AltCover.dll" ]) ("./Build/common-rules.xml", // Framework builds [ "_Binaries/AltCover/Debug+AnyCPU/net472/AltCover.exe" // framework builds "_Binaries/AltCover.Visualizer/Debug+AnyCPU/net472/AltCover.Visualizer.exe" ]) ("./Build/common-rules.xml", - [ "_Binaries/AltCover.Avalonia/Debug+AnyCPU/net7.0/AltCover.Visualizer.dll" ]) + [ "_Binaries/AltCover.Avalonia/Debug+AnyCPU/net8.0/AltCover.Visualizer.dll" ]) //("./Build/common-rules.xml", - // [ "_Binaries/AltCover.Avalonia11/Debug+AnyCPU/net7.0/AltCover.Visualizer.dll" ]) + // [ "_Binaries/AltCover.Avalonia11/Debug+AnyCPU/net8.0/AltCover.Visualizer.dll" ]) ("./Build/csharp-rules.xml", [ "_Binaries/AltCover.DataCollector/Debug+AnyCPU/netstandard2.0/AltCover.DataCollector.dll" "_Binaries/AltCover.Monitor/Debug+AnyCPU/netstandard2.0/AltCover.Local.Monitor.dll" @@ -1387,11 +1387,11 @@ module Targets = nugetCache @@ "cake.common/" + (ddItem "cake.common") - + "/lib/net7.0" + + "/lib/net8.0" nugetCache @@ "cake.core/" + (ddItem "cake.core") - + "/lib/net7.0" + + "/lib/net8.0" nugetCache @@ "communitytoolkit.diagnostics/" + (ddItem "communitytoolkit.diagnostics") @@ -2310,7 +2310,7 @@ module Targets = let reports = Path.getFullName "./_Reports" let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" let tests = // TODO monitor!not, Visualizer [ (Path.getFullName "_Binaries/AltCover.Expecto.Tests/Debug+AnyCPU/net9.0", // testDirectory @@ -2651,7 +2651,7 @@ module Targets = Directory.ensure "./_Reports" let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" let simpleReport = (Path.getFullName "./_Reports") @@ -2761,7 +2761,7 @@ module Targets = |> File.delete let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" let simpleReport = (Path.getFullName "./_Reports") @@ -2851,7 +2851,7 @@ module Targets = Directory.ensure "./_Reports" let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" [ ("Sample27", 18); ("Sample30", 27) ] |> List.iter (fun (sample, methodcount) -> @@ -2959,7 +2959,7 @@ module Targets = Directory.ensure "./_Reports" let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" let simpleReport = (Path.getFullName "./_Reports") @@ -3036,7 +3036,7 @@ module Targets = |> Seq.iter File.Delete let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" let simpleReport = (Path.getFullName "./_Reports") @@ -3263,7 +3263,7 @@ module Targets = let i = Path.getFullName "./_Mono/Sample1" let altcover = - Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" let prep = AltCover.PrepareOptions.Primitive( @@ -3317,7 +3317,7 @@ module Targets = |> AltCoverCommand.Prepare { AltCoverCommand.Options.Create prep with - ToolPath = "_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" + ToolPath = "_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.dll" ToolType = dotnetAltcover WorkingDirectory = "." } |> AltCoverCommand.run @@ -3643,7 +3643,7 @@ module Targets = @@ ("RecordResumeTestDotNet.xml") let binRoot = - Path.getFullName "_Binaries/AltCover/Release+AnyCPU/net7.0" + Path.getFullName "_Binaries/AltCover/Release+AnyCPU/net8.0" let sampleRoot = Path.getFullName "_Binaries/Sample8/Debug+AnyCPU/net9.0" @@ -3894,7 +3894,7 @@ module Targets = let text = File .ReadAllText(a) - .Replace("tools/netcoreapp2.0", "tools/net7.0/any") + .Replace("tools/netcoreapp2.0", "tools/net8.0/any") let name = (Path.getFullName "./_Intermediate/global") @@ -3933,7 +3933,7 @@ module Targets = |> Seq.toList let cake2Files where = - (!! "./_Binaries/AltCover.Cake/Release+AnyCPU/net7.0/AltCover.C*.*") + (!! "./_Binaries/AltCover.Cake/Release+AnyCPU/net8.0/AltCover.C*.*") |> Seq.map (fun x -> (x, Some(where + Path.GetFileName x), None)) |> Seq.toList @@ -4024,8 +4024,8 @@ module Targets = None) ] let globalFiles = - (!! "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.*") - |> Seq.map (fun x -> (x, Some("tools/net7.0/any/" + Path.GetFileName x), None)) + (!! "./_Binaries/AltCover/Release+AnyCPU/net8.0/AltCover.*") + |> Seq.map (fun x -> (x, Some("tools/net8.0/any/" + Path.GetFileName x), None)) |> Seq.toList let publishV = @@ -4049,12 +4049,12 @@ module Targets = [ (!! "./AltCover.Visualizer/DotnetToolSettings.xml") ] |> Seq.concat |> Seq.map (fun x -> // Avalonia - (x, Some("tools/net7.0/any/" + Path.GetFileName x), None)) + (x, Some("tools/net8.0/any/" + Path.GetFileName x), None)) |> Seq.toList let auxFiles = - (!! "./_Binaries/AltCover/Release+AnyCPU/net7.0/*.xml") - |> Seq.map (fun x -> (x, Some("tools/net7.0/any/" + Path.GetFileName x), None)) + (!! "./_Binaries/AltCover/Release+AnyCPU/net8.0/*.xml") + |> Seq.map (fun x -> (x, Some("tools/net8.0/any/" + Path.GetFileName x), None)) |> Seq.toList printfn "Executing on %A" Environment.OSVersion @@ -4063,10 +4063,10 @@ module Targets = [ applicationFiles resourceFiles "tools/net472/" libFiles "tools/net472/" - netcoreFiles "tools/net7.0" - poshFiles "tools/net7.0/" - poshHelpFiles "tools/net7.0/" - dataFiles "tools/net7.0/" + netcoreFiles "tools/net8.0" + poshFiles "tools/net8.0/" + poshHelpFiles "tools/net8.0/" + dataFiles "tools/net8.0/" monitorFiles "lib/netstandard2.0/" otherFiles housekeeping ], @@ -4093,7 +4093,7 @@ module Targets = "./_Generated/altcover.api.nuspec", "altcover.api") (List.concat - [ cake2Files "lib/net7.0/" + [ cake2Files "lib/net8.0/" cake0files housekeeping ], [ ("AltCover.Api", Version) ], @@ -4103,11 +4103,11 @@ module Targets = (List.concat [ globalFiles - netcoreFiles "tools/net7.0/any" - poshFiles "tools/net7.0/any/" - poshHelpFiles "tools/net7.0/any/" - dataFiles "tools/net7.0/any/" - monitorFiles "tools/net7.0/any/" + netcoreFiles "tools/net8.0/any" + poshFiles "tools/net8.0/any/" + poshHelpFiles "tools/net8.0/any/" + dataFiles "tools/net8.0/any/" + monitorFiles "tools/net8.0/any/" [ (Path.getFullName "Build/README.global.md", Some "", None) (Path.getFullName "./_Binaries/README.global.html", Some "", None) ] auxFiles @@ -4119,7 +4119,7 @@ module Targets = "altcover.global") (List.concat - [ vizFiles "tools/net7.0/any" // Avalonia + [ vizFiles "tools/net8.0/any" // Avalonia [ (Path.getFullName "Build/README.visualizer.md", Some "", None) (Path.getFullName "./_Binaries/README.visualizer.html", Some "", None) ] auxVFiles @@ -4254,7 +4254,7 @@ module Targets = Fake.DotNet.DotNet.PublishOptions.MSBuildParams.DistributedLoggers = None Fake.DotNet.DotNet.PublishOptions.MSBuildParams.DisableInternalBinLog = true - Framework = Some "net7.0" }) + Framework = Some "net8.0" }) netcoresource DotNet.publish @@ -4266,7 +4266,7 @@ module Targets = Fake.DotNet.DotNet.PublishOptions.MSBuildParams.DistributedLoggers = None Fake.DotNet.DotNet.PublishOptions.MSBuildParams.DisableInternalBinLog = true - Framework = Some "net7.0" }) + Framework = Some "net8.0" }) (Path.getFullName "./AltCover.Avalonia/AltCover.Avalonia.fsproj") // dotnet tooling mods @@ -4400,13 +4400,13 @@ module Targets = + p.ToLowerInvariant() + "/" + (toolPackages.Item p) - + "/lib/net7.0/" + + "/lib/net8.0/" let unpacked = "./_Packaging.api/Unpack/lib/netstandard2.0/" let uncake = - "./_Binaries/AltCover.Cake/Release+AnyCPU/net7.0/" + "./_Binaries/AltCover.Cake/Release+AnyCPU/net8.0/" Shell.copyFile (unpacked + "AltCover.Cake.dll") (uncake + "AltCover.Cake.dll") Shell.copyFile (unpacked + "AltCover.Cake.xml") (uncake + "AltCover.Cake.xml") @@ -4422,52 +4422,7 @@ module Targets = Shell.copyFile (unpacked + "System.Management.Automation.dll") ((packageVersionPart "PowerShellStandard.Library") - + "System.Management.Automation.dll") - - [ "AltCover.Base" - "AltCover.DotNet" - "AltCover.Engine" // beware static linkage -- maybe copy from debug? - "AltCover.Monitor" - "AltCover.PowerShell" - "AltCover.Toolkit" ] - |> List.iter (fun n -> - Shell.copyFile - (unpacked + n + ".xml") - ("./_Binaries/" - + n - + "/Release+AnyCPU/netstandard2.0/" - + n - + ".xml") - - Actions.RunDotnet - (dotnetOptions >> dotnetOptionsWithRollForwards) - "xmldocmd" - (unpacked - + n - + ".dll ./_Documentation/" - + n - + " --visibility public --skip-unbrowsable --clean") - ("documenting " + n)) - - [ "AltCover.Cake" ] - |> List.iter (fun n -> - Shell.copyFile - (unpacked + n + ".xml") - ("./_Binaries/" - + n - + "/Release+AnyCPU/net7.0/" - + n - + ".xml") - - Actions.RunDotnet - (dotnetOptions >> dotnetOptionsWithRollForwards) - "xmldocmd" - (unpacked - + n - + ".dll ./_Documentation/" - + n - + " --visibility public --skip-unbrowsable --clean") - ("documenting " + n))) + + "System.Management.Automation.dll")) let WindowsPowerShell = (fun () -> @@ -4499,7 +4454,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let unpackapi = Path.getFullName "_Packaging.api/Unpack/lib/netstandard2.0" @@ -4765,7 +4720,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/ReleaseMonoWithDotNet.xml" @@ -4804,7 +4759,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/ReleaseDotNetWithDotNet.xml" @@ -4848,7 +4803,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/AltCoverReleaseFSharpTypesDotNetRunner.xml" @@ -4896,7 +4851,7 @@ module Targets = Path.getFullName "./Samples/Sample2/Sample2.fsproj" let runner = - Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" + Path.getFullName "_Packaging/Unpack/tools/net8.0/AltCover.dll" let (dotnetexe, args) = defaultDotNetTestCommandLine (Some "net9.0") sample2 @@ -4925,7 +4880,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let s = Path.getFullName "." @@ -5031,7 +4986,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/ReleaseXUnitFSharpTypesDotNetRunner.xml" @@ -5075,7 +5030,7 @@ module Targets = Path.getFullName "./Samples/Sample4/Sample4.fsproj" let runner = - Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" + Path.getFullName "_Packaging/Unpack/tools/net8.0/AltCover.dll" let (dotnetexe, args) = defaultDotNetTestCommandLine (Some "net9.0") sample4 @@ -5109,7 +5064,7 @@ module Targets = Directory.ensure reportDir let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/OpenCoverForPester/OpenCoverForPester.xml" @@ -5152,7 +5107,7 @@ module Targets = Path.getFullName "./Samples/Sample18/Sample18.fsproj" let runner = - Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" + Path.getFullName "_Packaging/Unpack/tools/net8.0/AltCover.dll" let (dotnetexe, args) = defaultDotNetTestCommandLine (Some "net9.0") sample @@ -5223,7 +5178,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/ShowStatic.xml" @@ -5439,7 +5394,7 @@ module Targets = Path.getFullName "./Samples/Sample4/Sample4.fsproj" let runner = - Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" + Path.getFullName "_Packaging/Unpack/tools/net8.0/AltCover.dll" let (dotnetexe, args) = defaultDotNetTestCommandLine (Some "net9.0") sample4 @@ -5499,7 +5454,7 @@ module Targets = Directory.ensure "./_Reports" let unpack = - Path.getFullName "_Packaging/Unpack/tools/net7.0" + Path.getFullName "_Packaging/Unpack/tools/net8.0" let x = Path.getFullName "./_Reports/ReleaseXUnitFSharpTypesDotNetFullRunner.xml" @@ -5543,7 +5498,7 @@ module Targets = Path.getFullName "./Samples/Sample4/Sample4.fsproj" let runner = - Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" + Path.getFullName "_Packaging/Unpack/tools/net8.0/AltCover.dll" let (dotnetexe, args) = defaultDotNetTestCommandLine (Some "net9.0") sample4 @@ -5822,7 +5777,7 @@ module Targets = "Fake2738Workround", "True" ] }) "./Samples/Sample4/Sample4LongForm.fsproj") - let Cake4Test = + let cake5plusTest = (fun () -> let before = Actions.ticksNow () @@ -5909,7 +5864,7 @@ module Targets = .Replace("{1}", Version) ) - [ (" --version 4.0.0", "build.cake") + [ (" --version 5.0.0", "build.cake") (String.Empty, "build.cake") ] |> List.iter (fun (cakeversion, script) -> try @@ -7851,6 +7806,54 @@ module Targets = let MakeDocumentation = (fun () -> + let unpacked = + "./_Packaging.api/Unpack/lib/netstandard2.0/" + + [ "AltCover.Base" + "AltCover.DotNet" + "AltCover.Engine" // beware static linkage -- maybe copy from debug? + "AltCover.Monitor" + "AltCover.PowerShell" + "AltCover.Toolkit" ] + |> List.iter (fun n -> + Shell.copyFile + (unpacked + n + ".xml") + ("./_Binaries/" + + n + + "/Release+AnyCPU/netstandard2.0/" + + n + + ".xml") + + Actions.RunDotnet + (dotnetOptions >> dotnetOptionsWithRollForwards) + "xmldocmd" + (unpacked + + n + + ".dll ./_Documentation/" + + n + + " --visibility public --skip-unbrowsable --clean") + ("documenting " + n)) + + [ "AltCover.Cake" ] + |> List.iter (fun n -> + Shell.copyFile + (unpacked + n + ".xml") + ("./_Binaries/" + + n + + "/Release+AnyCPU/net8.0/" + + n + + ".xml") + + Actions.RunDotnet + (dotnetOptions >> dotnetOptionsWithRollForwards) + "xmldocmd" + (unpacked + + n + + ".dll ./_Documentation/" + + n + + " --visibility public --skip-unbrowsable --clean") + ("documenting " + n)) + let branch = Information.getBranchName (".") Assert.That(branch, Is.EqualTo("master").Or.StartWith("develop/docs/"), branch) @@ -8181,7 +8184,7 @@ module Targets = _Target "JsonReporting" JsonReporting _Target "MSBuildTest" MSBuildTest - _Target "Cake4Test" Cake4Test + _Target "cake5plusTest" cake5plusTest _Target "ApiUse" ApiUse _Target "DotnetTestIntegration" DotnetTestIntegration _Target "Issue20" Issue20 @@ -8455,7 +8458,7 @@ module Targets = "Unpack" ==> "ApiUse" ==> "Deployment" |> ignore - "Unpack" ==> "Cake4Test" ==> "Deployment" + "Unpack" ==> "cake5plusTest" ==> "Deployment" |> ignore "Unpack" diff --git a/Directory.Packages.props b/Directory.Packages.props index e531095c..6f63c07d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,8 +13,8 @@ - - + + @@ -38,14 +38,14 @@ - + - + - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -75,13 +75,13 @@ - + - + diff --git a/RegressionTesting/issue37/issue37.xml b/RegressionTesting/issue37/issue37.xml index a7b1b2b5..28cf889e 100644 --- a/RegressionTesting/issue37/issue37.xml +++ b/RegressionTesting/issue37/issue37.xml @@ -1,7 +1,7 @@ - net7.0 + net8.0 Major false diff --git a/ReleaseNotes.md b/ReleaseNotes.md index e739c543..62eef1cd 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -4,8 +4,8 @@ A. Start with the Quick Start guide : https://github.com/SteveGilham/altcover/wi 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; build with Fake.build 6.1.1 but supports back to 6.0.0 +* [BREAKING] Minimum platforms net472, netstandard2.0 and net8.0. *NOTE* the recorder assembly still targets net20 (or net46 when `async` is detected) +* [BREAKING] SDK updates to latest current for Cake (5.0.0) and MSBuild (17.12.6) packages; build with Fake.build 6.1.3 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) diff --git a/global.json b/global.json index 2c2ec83c..f15a9592 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11", + "version": "9.0.100", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/nupkg/build/AltCover.targets b/nupkg/build/AltCover.targets index 2b574b50..7942a008 100644 --- a/nupkg/build/AltCover.targets +++ b/nupkg/build/AltCover.targets @@ -1,7 +1,7 @@ - $(MSBuildThisFileDirectory)../tools/net7.0/AltCover.Engine.dll + $(MSBuildThisFileDirectory)../tools/net8.0/AltCover.Engine.dll $(MSBuildThisFileDirectory)../lib/netstandard2.0/AltCover.Engine.dll $(AltCoverNetStdEngine) $(AltCoverNetCoreEngine)