From 98d54a95985cb423b61da36a5ec2cf467e1df1b5 Mon Sep 17 00:00:00 2001 From: SteveGilham Date: Sat, 27 Jul 2024 23:04:01 +0100 Subject: [PATCH] Burn more bridges - this is the net9.0 stream --- AltCover.Api.Tests/AltCover.Api.Tests.fsproj | 2 +- .../AltCover.Expecto.Tests.fsproj | 2 +- .../AltCover.Monitor.Tests.fsproj | 2 +- AltCover.Monitor.Tests/MonitorTest.fs | 2 +- .../AltCover.Recorder.Tests.fsproj | 2 +- .../AltCover.Recorder2.Tests.fsproj | 2 +- AltCover.Tests/AltCover.Tests.fsproj | 2 +- AltCover.Tests/AltCoverFSharpTypes.n3.xml | 16 +- .../OpenCoverForPester.coverlet.xml | 14 +- AltCover.Tests/Runner.Tests.fs | 2 +- AltCover.Tests/Tests.fs | 18 +- AltCover.Tests/Tests3.fs | 2 +- AltCover.Tests/XTests.fs | 2 +- .../AltCover.ValidateGendarmeEmulation.fsproj | 2 +- .../AltCover.Visualizer.Tests.fsproj | 2 +- Build/Directory.Build.props | 2 +- Build/DriveApi.fsproj | 2 +- Build/Pester.Tests.ps1 | 18 +- Build/actions.fs | 2 +- Build/merge-coverage.ps1 | 8 +- Build/msbuildtest.proj | 10 +- Build/targets.fs | 206 ++++++++++-------- Demo/Echo/Echo/Echo.csproj | 2 +- Demo/Echo/Test/Test.csproj | 2 +- Demo/MultiTest/Test1/Test1.fsproj | 2 +- Demo/MultiTest/Test2/Test2.fsproj | 2 +- RegressionTesting/SoakTest1/SoakTest1.fsproj | 2 +- .../issue20/xunit-tests/xunit-tests.xml | 2 +- Samples/Sample1/Sample1.csproj | 2 +- Samples/Sample10/Sample10.csproj | 2 +- Samples/Sample12/Sample12.csproj | 2 +- Samples/Sample13/Sample13.fsproj | 2 +- Samples/Sample14/Sample14/Sample14.csproj | 2 +- Samples/Sample16/Test/Test/Test.csproj | 2 +- Samples/Sample17/Sample17.fsproj | 2 +- Samples/Sample2/Sample2.fsproj | 2 +- Samples/Sample21/Sample21.csproj | 4 +- Samples/Sample23/Sample23.csproj | 2 +- Samples/Sample24/Sample24.csproj | 2 +- Samples/Sample26/Sample26.fsproj | 2 +- Samples/Sample27/Sample27.fsproj | 2 +- Samples/Sample30/Sample30.fsproj | 2 +- Samples/Sample32/Sample32.csproj | 2 +- Samples/Sample4/Sample4.fsproj | 2 +- Samples/Sample4/Sample4LongForm.fsproj | 4 +- Samples/Sample6/Sample6.fsproj | 4 +- Samples/Sample7/Sample7.fsproj | 2 +- Samples/Sample8/Sample8.csproj | 2 +- global.json | 2 +- 49 files changed, 200 insertions(+), 180 deletions(-) diff --git a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj index 23af45cd3..0982248a5 100644 --- a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj +++ b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 false AltCover.Api.Tests false diff --git a/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj b/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj index b8c23a3b5..91b36b147 100644 --- a/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj +++ b/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 DEBUG;TRACE;EXPECTO_MAIN false diff --git a/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj b/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj index e9d264f69..c27275b11 100644 --- a/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj +++ b/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 false AltCover.Monitor.Tests false diff --git a/AltCover.Monitor.Tests/MonitorTest.fs b/AltCover.Monitor.Tests/MonitorTest.fs index 6997a9dd9..4d7ab0d3c 100644 --- a/AltCover.Monitor.Tests/MonitorTest.fs +++ b/AltCover.Monitor.Tests/MonitorTest.fs @@ -16,7 +16,7 @@ module MonitorTests = [ (261, 0) ] // 0 because NCover format Path.Combine( AltCover.SolutionRoot.location, - "_Reports/MonitorTestWithAltCoverCoreRunner.net8.0.xml" + "_Reports/MonitorTestWithAltCoverCoreRunner.net9.0.xml" ), [ (260, 37); (260, 36) ] ] |> List.filter (fst >> File.Exists) diff --git a/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj b/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj index 3a8a34a7d..e62fcb29d 100644 --- a/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj +++ b/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 false AltCover.Recorder.Tests false diff --git a/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj b/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj index 425492cfc..1b89d6dd4 100644 --- a/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj +++ b/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false AltCover.Recorder2.Tests false diff --git a/AltCover.Tests/AltCover.Tests.fsproj b/AltCover.Tests/AltCover.Tests.fsproj index fe2611d7c..4f86cdf5d 100644 --- a/AltCover.Tests/AltCover.Tests.fsproj +++ b/AltCover.Tests/AltCover.Tests.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 false AltCover.Tests MONO diff --git a/AltCover.Tests/AltCoverFSharpTypes.n3.xml b/AltCover.Tests/AltCoverFSharpTypes.n3.xml index 498bf0ae4..54d329741 100644 --- a/AltCover.Tests/AltCoverFSharpTypes.n3.xml +++ b/AltCover.Tests/AltCoverFSharpTypes.n3.xml @@ -75,7 +75,7 @@ - 100663319 + 100663320 Tests.DU/MyUnion Tests.DU/MyUnion::as_bar() @@ -93,7 +93,7 @@ - 100663320 + 100663321 Microsoft.FSharp.Core.FSharpFunc`2<Microsoft.FSharp.Core.Unit,Tests.DU/MyUnion> Tests.DU/MyUnion::get_MyBar() @@ -110,11 +110,11 @@ - 100663340 + 100663341 Tests.DU/MyUnion Tests.DU/get_MyBar@46::Invoke(Microsoft.FSharp.Core.Unit) - + @@ -124,7 +124,7 @@ - 100663341 + 100663342 System.Void Tests.DU/MyClass::.ctor() @@ -141,7 +141,7 @@ - 100663344 + 100663345 Tests.M/Thing Tests.M::makeThing(System.String) @@ -152,7 +152,7 @@ - 100663345 + 100663346 System.Void Tests.M::testMakeThing() @@ -170,7 +170,7 @@ - 100663355 + 100663357 System.Byte[] Tests.M/Thing::bytes() diff --git a/AltCover.Tests/OpenCoverForPester.coverlet.xml b/AltCover.Tests/OpenCoverForPester.coverlet.xml index cdf523a58..4b2d87c1f 100644 --- a/AltCover.Tests/OpenCoverForPester.coverlet.xml +++ b/AltCover.Tests/OpenCoverForPester.coverlet.xml @@ -153,7 +153,7 @@ - 100663323 + 100663324 Tests.DU/MyUnion Tests.DU/MyUnion::AsBar() @@ -177,7 +177,7 @@ - 100663324 + 100663325 Microsoft.FSharp.Core.FSharpFunc`2<Microsoft.FSharp.Core.Unit,Tests.DU/MyUnion> Tests.DU/MyUnion::get_MyBar() @@ -194,7 +194,7 @@ - 100663346 + 100663347 System.Int32 Tests.DU/MyClass::get_Property() @@ -211,7 +211,7 @@ - 100663355 + 100663356 System.Tuple`2<System.Double,System.Double> Tests.DU/compute@74::Invoke(System.Double,System.Double,System.Double) @@ -228,7 +228,7 @@ - 100663361 + 100663362 Tests.M/Thing Tests.M::makeThing(System.String) @@ -239,7 +239,7 @@ - 100663362 + 100663363 System.Void Tests.M::testMakeThing() @@ -266,7 +266,7 @@ - 100663372 + 100663374 System.Byte[] Tests.M/Thing::Bytes() diff --git a/AltCover.Tests/Runner.Tests.fs b/AltCover.Tests/Runner.Tests.fs index 6f468df10..8e4442f0d 100644 --- a/AltCover.Tests/Runner.Tests.fs +++ b/AltCover.Tests/Runner.Tests.fs @@ -2213,7 +2213,7 @@ module AltCoverRunnerTests = let path = Path.Combine( SolutionRoot.location, - "_Binaries/Sample12/Debug+AnyCPU/net8.0/Sample12.dll" + "_Binaries/Sample12/Debug+AnyCPU/net9.0/Sample12.dll" ) #endif diff --git a/AltCover.Tests/Tests.fs b/AltCover.Tests/Tests.fs index 232a0dd60..b01bb15c1 100644 --- a/AltCover.Tests/Tests.fs +++ b/AltCover.Tests/Tests.fs @@ -72,7 +72,7 @@ module AltCoverTests = #if !NET472 let dir = - Path.Combine(SolutionDir(), "_Binaries/AltCover.Tests/Debug+AnyCPU/net8.0") + Path.Combine(SolutionDir(), "_Binaries/AltCover.Tests/Debug+AnyCPU/net9.0") #else let dir = Path.Combine(SolutionDir(), "_Binaries/AltCover.Tests/Debug+AnyCPU/net472") @@ -86,13 +86,15 @@ module AltCoverTests = #if !NET472 let sample4path = - Path.Combine(SolutionDir(), "_Binaries/Sample4/Debug+AnyCPU/net8.0/Sample4.dll") + Path.Combine(SolutionDir(), "_Binaries/Sample4/Debug+AnyCPU/net9.0/Sample4.dll") let sample8path = - Path.Combine(SolutionDir(), "_Binaries/Sample8/Debug+AnyCPU/net8.0/Sample8.dll") + Path.Combine(SolutionDir(), "_Binaries/Sample8/Debug+AnyCPU/net9.0/Sample8.dll") + let sample32path = - Path.Combine(SolutionDir(), "_Binaries/Sample32/Debug+AnyCPU/net8.0/Sample32.dll") + Path.Combine(SolutionDir(), "_Binaries/Sample32/Debug+AnyCPU/net9.0/Sample32.dll") + #else let sample4path = Path.Combine(SolutionDir(), "_Binaries/Sample4/Debug+AnyCPU/net472/Sample4.dll") @@ -3854,7 +3856,7 @@ module AltCoverTests = Main.I.selectReportGenerator () let path = - Path.Combine(SolutionDir(), "_Binaries/Sample4/Debug+AnyCPU/net8.0/Sample4.dll") + Path.Combine(SolutionDir(), "_Binaries/Sample4/Debug+AnyCPU/net9.0/Sample4.dll") "Main" |> (Regex @@ -4164,7 +4166,7 @@ module AltCoverTests = sample4path .Replace("4", "5") .Replace("572", "472") - .Replace("net8.0", "netstandard2.0") + .Replace("net9.0", "netstandard2.0") let path6 = sample4path @@ -5896,9 +5898,9 @@ module AltCoverTests = OpenCover.reportGenerator () let sample21 = - Path.Combine(SolutionDir(), "./_Binaries/Sample21/Debug+AnyCPU/net8.0/Sample21.dll") + Path.Combine(SolutionDir(), "./_Binaries/Sample21/Debug+AnyCPU/net9.0/Sample21.dll") - Assert.That(File.Exists sample21, "Test file Sample21 for net8.0 not built") + Assert.That(File.Exists sample21, "Test file Sample21 for net9.0 not built") try "Program" diff --git a/AltCover.Tests/Tests3.fs b/AltCover.Tests/Tests3.fs index f4f1da092..b1144ea03 100644 --- a/AltCover.Tests/Tests3.fs +++ b/AltCover.Tests/Tests3.fs @@ -4807,7 +4807,7 @@ module AltCoverTests3 = Path.Combine( SolutionRoot.location, #if !NET472 - "_Binaries/Sample4/Debug+AnyCPU/net8.0" + "_Binaries/Sample4/Debug+AnyCPU/net9.0" ) #else "_Binaries/Sample4/Debug+AnyCPU/net472" diff --git a/AltCover.Tests/XTests.fs b/AltCover.Tests/XTests.fs index 001a15a5d..9fe06918c 100644 --- a/AltCover.Tests/XTests.fs +++ b/AltCover.Tests/XTests.fs @@ -752,7 +752,7 @@ module AltCoverXTests = let here = SolutionDir() let path = - Path.Combine(here, "_Binaries/Sample4/Debug+AnyCPU/net8.0") + Path.Combine(here, "_Binaries/Sample4/Debug+AnyCPU/net9.0") let key0 = Path.Combine(here, "Build/SelfTest.snk") diff --git a/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj b/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj index 22282ba33..6c03cd04e 100644 --- a/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj +++ b/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 false 2024.6.28.12460 ..\packages\altcode.gendarme\$(GendarmeVersion)\tools\ diff --git a/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj b/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj index f650d4061..f13c39e34 100644 --- a/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj +++ b/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 false false AltCover.Tests.Visualizer diff --git a/Build/Directory.Build.props b/Build/Directory.Build.props index 64e9ecb87..cee1f2587 100644 --- a/Build/Directory.Build.props +++ b/Build/Directory.Build.props @@ -2,7 +2,7 @@ $ Exe - net8.0 + net9.0 \ No newline at end of file diff --git a/Build/DriveApi.fsproj b/Build/DriveApi.fsproj index f31ff1800..066bd388e 100644 --- a/Build/DriveApi.fsproj +++ b/Build/DriveApi.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 MSB3243;NU1902,NU1903,NU1904 diff --git a/Build/Pester.Tests.ps1 b/Build/Pester.Tests.ps1 index a018c3d14..af11d6625 100644 --- a/Build/Pester.Tests.ps1 +++ b/Build/Pester.Tests.ps1 @@ -42,15 +42,15 @@ Describe "Add-Accelerator" { Describe "Invoke-Altcover" { It "instruments and collects" { - $o = "./_Binaries/Invoke-Altcover_Sample2/Debug+AnyCPU/net8.0" + $o = "./_Binaries/Invoke-Altcover_Sample2/Debug+AnyCPU/net9.0" $x = "./_Reports/PesterFSharpTypesDotNetRunner.xml" - $i = "./_Binaries/Sample2/Debug+AnyCPU/net8.0" + $i = "./_Binaries/Sample2/Debug+AnyCPU/net9.0" if (Test-Path $o) { Remove-Item -Force -Recurse $o } if (Test-Path $x) { Remove-Item -force $x } - Invoke-AltCover -Report $x -OutputDirectory $o -InputDirectory $i -AssemblyFilter ("?Sample2", "Adapter") -ReportFormat NCover -All -InformationAction Continue -Verbosity Verbose + Invoke-AltCover -Report $x -OutputDirectory $o -InputDirectory $i -AssemblyFilter ("?Sample2", "Adapter") -ReportFormat NCover -InformationAction Continue -Verbosity Verbose $o | Should -Exist $x | Should -Exist $xm = [xml](Get-Content $x) @@ -69,7 +69,7 @@ Describe "Invoke-Altcover" { $w | Should -Be "A total of 0 visits recorded" $env:AltCoverTag = "Invoke-Altcover_" - $summary = Invoke-AltCover -InformationAction Continue -Runner -RecorderDirectory $o -WorkingDirectory "./Samples/Sample2" -Executable "dotnet" -CommandLine @("test", "--no-build", "--configuration", "Debug", "--framework", "net8.0", "Sample2.fsproj") #, "/p:AltCoverTag=Invoke-Altcover_") + $summary = Invoke-AltCover -InformationAction Continue -Runner -RecorderDirectory $o -WorkingDirectory "./Samples/Sample2" -Executable "dotnet" -CommandLine @("test", "--no-build", "--configuration", "Debug", "--framework", "net9.0", "Sample2.fsproj") #, "/p:AltCoverTag=Invoke-Altcover_") $env:AltCoverTag = "" $xm2 = [xml](Get-Content $x) $result = [string]::Join(" ", $xm2.coverage.module.method.seqpnt.visitcount) @@ -79,7 +79,7 @@ Describe "Invoke-Altcover" { } It "Fails on garbage" { - $o = "./Samples/Sample2/_Binaries/Sample2/Debug+AnyCPU/net8.0" + $o = "./Samples/Sample2/_Binaries/Sample2/Debug+AnyCPU/net9.0" $x = "./_Reports/PesterFSharpTypesDotNetRunner.xml" try { @@ -375,7 +375,7 @@ Describe "ConvertTo-BarChart" { Describe "ConvertFrom-NCover" { It "converts" { $assemblies = @() - $assemblies += "./_Binaries/Sample4/Debug+AnyCPU/net8.0/Sample4.dll" + $assemblies += "./_Binaries/Sample4/Debug+AnyCPU/net9.0/Sample4.dll" $xml = ConvertFrom-NCover -InputFile "./_Reports/ReleaseXUnitFSharpTypesDotNetRunner.xml" -Assembly $Assemblies -OutputFile "./_Packaging/AltCoverFSharpTypes.xml" $xml | Should -BeOfType [xdoc] @@ -400,7 +400,7 @@ Describe "ConvertFrom-NCover" { $expected = $expected.Replace("Sample4|Program.fs", (Join-Path $fullpath "Program.fs")) $expected = $expected.Replace("Sample4|Tests.fs", (Join-Path $fullpath "Tests.fs")) $expected = $expected.Replace("./_Binaries/Sample4/Debug+AnyCPU/net6.0/Sample4.dll", - "" + [System.IO.Path]::GetFullPath("./_Binaries/Sample4/Debug+AnyCPU/net8.0/Sample4.dll")) + "" + [System.IO.Path]::GetFullPath("./_Binaries/Sample4/Debug+AnyCPU/net9.0/Sample4.dll")) $result = $sw.ToString().Replace("`r", "").Replace("utf-16", "utf-8") $result = $result.Replace("rapScore=`"13.12", "rapScore=`"13.13").Replace("rapScore=`"8.12", "rapScore=`"8.13") @@ -412,7 +412,7 @@ Describe "ConvertFrom-NCover" { It "converts from the pipeline" { $assemblies = @() - $assemblies += "./_Binaries/Sample4/Debug+AnyCPU/net8.0/Sample4.dll" + $assemblies += "./_Binaries/Sample4/Debug+AnyCPU/net9.0/Sample4.dll" $xml = [xdoc]::Load("./_Reports/ReleaseXUnitFSharpTypesDotNetRunner.xml") | ConvertFrom-NCover -Assembly $Assemblies $xml | Should -BeOfType [xdoc] @@ -437,7 +437,7 @@ Describe "ConvertFrom-NCover" { $expected = $expected.Replace("Sample4|Program.fs", (Join-Path $fullpath "Program.fs")) $expected = $expected.Replace("Sample4|Tests.fs", (Join-Path $fullpath "Tests.fs")) $expected = $expected.Replace("./_Binaries/Sample4/Debug+AnyCPU/net6.0/Sample4.dll", - "" + [System.IO.Path]::GetFullPath("./_Binaries/Sample4/Debug+AnyCPU/net8.0/Sample4.dll")) + "" + [System.IO.Path]::GetFullPath("./_Binaries/Sample4/Debug+AnyCPU/net9.0/Sample4.dll")) $result = $sw.ToString().Replace("`r", "").Replace("utf-16", "utf-8") $result = $result.Replace("rapScore=`"13.12", "rapScore=`"13.13").Replace("rapScore=`"8.12", "rapScore=`"8.13") diff --git a/Build/actions.fs b/Build/actions.fs index 92d37f5ff..256ba1079 100644 --- a/Build/actions.fs +++ b/Build/actions.fs @@ -663,7 +663,7 @@ a:hover {color: #ecc;} let trackedFormat = """ - + """ coverageDocument.Descendants(XName.Get("TrackedMethods")) diff --git a/Build/merge-coverage.ps1 b/Build/merge-coverage.ps1 index 1ac30a92f..ac96c82e1 100644 --- a/Build/merge-coverage.ps1 +++ b/Build/merge-coverage.ps1 @@ -2,11 +2,11 @@ Import-Module "./_Packaging/Unpack/tools/netcoreapp2.0/AltCover.PowerShell.dll" $files = ("_Reports/UnitTestWithAltCoverCoreRunner.xml", - "_Reports/ApiTestWithAltCoverCoreRunner.net8.0.xml", - "_Reports/MonitorTestWithAltCoverCoreRunner.net8.0.xml", - "_Reports/RecorderTestWithAltCoverCoreRunner.net8.0.xml", "_Reports/Recorder2TestWithAltCoverCoreRunner.xml", - "_Reports/ValidateGendarmeEmulationUnitTestWithAltCoverCoreRunner.net8.0.xml", + "_Reports/ApiTestWithAltCoverCoreRunner.net9.0.xml", + "_Reports/MonitorTestWithAltCoverCoreRunner.net9.0.xml", + "_Reports/RecorderTestWithAltCoverCoreRunner.net9.0.xml", + "_Reports/ValidateGendarmeEmulationUnitTestWithAltCoverCoreRunner.net9.0.xml", "_Reports/Pester.xml" ) $xml = $files | Merge-OpenCover -OutputFile "_Reports/CombinedTestWithAltCoverRunner.coveralls" \ No newline at end of file diff --git a/Build/msbuildtest.proj b/Build/msbuildtest.proj index 6d8c46b2f..f6ff459e8 100644 --- a/Build/msbuildtest.proj +++ b/Build/msbuildtest.proj @@ -8,11 +8,11 @@ - - + + - + - + + RecorderDirectory="$(MSBuildThisFileDirectory)../_Binaries/$(AltCoverTag)Sample4/Debug+AnyCPU/net9.0" /> \ No newline at end of file diff --git a/Build/targets.fs b/Build/targets.fs index 54cdfebad..55268903a 100644 --- a/Build/targets.fs +++ b/Build/targets.fs @@ -444,7 +444,7 @@ module Targets = >> common ) with NoBuild = true - Framework = fwk // Some "net8.0" + Framework = fwk // Some "net9.0" Configuration = DotNet.BuildConfiguration.Debug } let defaultDotNetTestCommandLine fwk project = @@ -466,7 +466,7 @@ module Targets = Configuration = DotNet.BuildConfiguration.Debug ResultsDirectory = Some report NoBuild = true - Framework = Some "net8.0" + Framework = Some "net9.0" Settings = Some "./_Generated/coverletArgs.runsettings" Collect = Some "XPlat Code Coverage" } |> (testWithCLITaggedArguments tag) @@ -982,7 +982,7 @@ module Targets = "./Samples/Sample28/SourceGenerators.sln" ] |> Seq.iter dotnetBuildDebug - Shell.copy "./_SourceLink" (!! "./_Binaries/Sample14/Debug+AnyCPU/net8.0/*")) + Shell.copy "./_SourceLink" (!! "./_Binaries/Sample14/Debug+AnyCPU/net9.0/*")) let BuildMonoSamples = (fun () -> @@ -1128,8 +1128,8 @@ module Targets = [ "_Binaries/AltCover.Engine/Debug+AnyCPU/netstandard2.0/AltCover.Engine.dll" "_Binaries/AltCover.Base/Debug+AnyCPU/netstandard2.0/AltCover.Base.dll" ]) ("./Build/build-rules.xml", - [ "$Binaries/Setup/Debug+AnyCPU/net8.0/Setup.dll" - "$Binaries/Build/Debug+AnyCPU/net8.0/Build.dll" ]) + [ "$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.Recorder/Debug+AnyCPU/net20/AltCover.Recorder.dll" @@ -1742,7 +1742,7 @@ module Targets = DotNet.build (fun p -> { p.WithCommon dotnetOptions with Configuration = DotNet.BuildConfiguration.Debug - Framework = Some "net8.0" } + Framework = Some "net9.0" } |> (buildWithCLITaggedArguments "UnitTestDotNet")) !!(@"./*Test*/*Tests.fsproj") |> Seq.iter buildIt @@ -1760,7 +1760,7 @@ module Targets = DotNet.test (fun p -> { p.WithCommon dotnetOptions with Configuration = DotNet.BuildConfiguration.Debug - Framework = Some "net8.0" + Framework = Some "net9.0" NoBuild = true } |> (testWithCLITaggedArguments "UnitTestDotNet")) @@ -1799,7 +1799,7 @@ module Targets = DotNet.build (fun p -> { p.WithCommon dotnetOptions with Configuration = DotNet.BuildConfiguration.Debug - Framework = Some "net8.0" } + Framework = Some "net9.0" } |> (buildWithCLITaggedArguments "Coverlet")) )) @@ -2343,47 +2343,47 @@ module Targets = Path.getFullName "./_Binaries/AltCover/Release+AnyCPU/net7.0/AltCover.dll" let tests = // TODO monitor!not, Visualizer - [ (Path.getFullName "_Binaries/AltCover.Expecto.Tests/Debug+AnyCPU/net8.0", // testDirectory + [ (Path.getFullName "_Binaries/AltCover.Expecto.Tests/Debug+AnyCPU/net9.0", // testDirectory Path.getFullName - "_Binaries/UnitTestWithAltCoverCore_AltCover.Expecto.Tests/Debug+AnyCPU/net8.0", // output + "_Binaries/UnitTestWithAltCoverCore_AltCover.Expecto.Tests/Debug+AnyCPU/net9.0", // output reports @@ "UnitTestWithAltCoverCore.xml", // report "AltCover.Expecto.Tests.fsproj", // project Path.getFullName "AltCover.Expecto.Tests") // workingDirectory - (Path.getFullName "_Binaries/AltCover.Recorder.Tests/Debug+AnyCPU/net8.0", + (Path.getFullName "_Binaries/AltCover.Recorder.Tests/Debug+AnyCPU/net9.0", Path.getFullName - "_Binaries/UnitTestWithAltCoverCore_AltCover.Recorder.Tests/Debug+AnyCPU/net8.0", + "_Binaries/UnitTestWithAltCoverCore_AltCover.Recorder.Tests/Debug+AnyCPU/net9.0", reports @@ "RecorderTestWithAltCoverCore.xml", "AltCover.Recorder.Tests.fsproj", Path.getFullName "AltCover.Recorder.Tests") - (Path.getFullName "_Binaries/AltCover.Recorder2.Tests/Debug+AnyCPU/net8.0", + (Path.getFullName "_Binaries/AltCover.Recorder2.Tests/Debug+AnyCPU/net9.0", Path.getFullName "_Binaries/UnitTestWithAltCoverCore_AltCover.Recorder2.Tests/Debug+AnyCPU/net8.0", reports @@ "Recorder2TestWithAltCoverCore.xml", "AltCover.Recorder2.Tests.fsproj", Path.getFullName "AltCover.Recorder2.Tests") - (Path.getFullName "_Binaries/AltCover.Api.Tests/Debug+AnyCPU/net8.0", // testDirectory + (Path.getFullName "_Binaries/AltCover.Api.Tests/Debug+AnyCPU/net9.0", // testDirectory Path.getFullName - "_Binaries/UnitTestWithAltCoverCore_AltCover.Api.Tests/Debug+AnyCPU/net8.0", // output + "_Binaries/UnitTestWithAltCoverCore_AltCover.Api.Tests/Debug+AnyCPU/net9.0", // output reports @@ "ApiUnitTestWithAltCoverCore.xml", // report "AltCover.Api.Tests.fsproj", // project Path.getFullName "AltCover.Api.Tests") // workingDirectory - (Path.getFullName "_Binaries/AltCover.Monitor.Tests/Debug+AnyCPU/net8.0", // testDirectory + (Path.getFullName "_Binaries/AltCover.Monitor.Tests/Debug+AnyCPU/net9.0", // testDirectory Path.getFullName - "_Binaries/UnitTestWithAltCoverCore_AltCover.Monitor.Tests/Debug+AnyCPU/net8.0", // output + "_Binaries/UnitTestWithAltCoverCore_AltCover.Monitor.Tests/Debug+AnyCPU/net9.0", // output reports @@ "MonitorTestWithAltCoverCore.xml", // report "AltCover.Monitor.Tests.fsproj", // project Path.getFullName "AltCover.Monitor.Tests") // workingDirectory - (Path.getFullName "_Binaries/AltCover.Visualizer.Tests/Debug+AnyCPU/net8.0", // testDirectory + (Path.getFullName "_Binaries/AltCover.Visualizer.Tests/Debug+AnyCPU/net9.0", // testDirectory Path.getFullName - "_Binaries/UnitTestWithAltCoverCore_AltCover.Visualizer.Tests/Debug+AnyCPU/net8.0", // output + "_Binaries/UnitTestWithAltCoverCore_AltCover.Visualizer.Tests/Debug+AnyCPU/net9.0", // output reports @@ "VisualizerUnitTestWithAltCoverCore.xml", // report "AltCover.Visualizer.Tests.fsproj", // project Path.getFullName "AltCover.Visualizer.Tests") // workingDirectory (Path.getFullName - "_Binaries/AltCover.ValidateGendarmeEmulation/Debug+AnyCPU/net8.0", // testDirectory + "_Binaries/AltCover.ValidateGendarmeEmulation/Debug+AnyCPU/net9.0", // testDirectory Path.getFullName - "_Binaries/UnitTestWithAltCoverCore_AltCover.ValidateGendarmeEmulation/Debug+AnyCPU/net8.0", // output + "_Binaries/UnitTestWithAltCoverCore_AltCover.ValidateGendarmeEmulation/Debug+AnyCPU/net9.0", // output reports @@ "ValidateGendarmeEmulationUnitTestWithAltCoverCore.xml", // report "AltCover.ValidateGendarmeEmulation.fsproj", // project @@ -2422,7 +2422,7 @@ module Targets = |> DotNet.test (fun p -> { p.WithCommon(withWorkingDirectoryVM workingDirectory) with Configuration = DotNet.BuildConfiguration.Debug - Framework = Some "net8.0" + Framework = Some "net9.0" NoBuild = true } |> (testWithCLITaggedArguments "UnitTestWithAltCoverCore") |> (collectorTestOptions (project |> Path.GetFileNameWithoutExtension))) @@ -2574,7 +2574,7 @@ module Targets = DotNet.test (fun to' -> { to'.WithCommon(withWorkingDirectoryVM testdir) with - Framework = Some "net8.0" + Framework = Some "net9.0" NoBuild = false } .WithAltCoverOptions prep @@ -2595,7 +2595,7 @@ module Targets = if File.Exists report then report else - report.Replace(".xml", ".net8.0.xml")) + report.Replace(".xml", ".net9.0.xml")) |> List.filter (fun f -> File.Exists f && f.Contains("Visualizer") |> not) let pester = @@ -2622,7 +2622,7 @@ module Targets = if File.Exists report then report else - report.Replace(".xml", ".net8.0.xml")) + report.Replace(".xml", ".net9.0.xml")) |> List.filter (fun f -> File.Exists f && f.Contains("Visualizer"))) uncovered @"_Reports/_UnitTestWithAltCoverCoreRunner/Summary.xml" @@ -2688,7 +2688,7 @@ module Targets = @@ ("AltCoverFSharpTests.xml") let sampleRoot = - Path.getFullName "_Binaries/FSharpTests_Sample7/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/FSharpTests_Sample7/Debug+AnyCPU/net9.0" // Test the --inplace operation Shell.cleanDir sampleRoot @@ -2798,7 +2798,7 @@ module Targets = @@ ("AltCoverAsyncAwaitTests.xml") let sampleRoot = - Path.getFullName "_Binaries/AsyncAwaitTests_Sample24/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/AsyncAwaitTests_Sample24/Debug+AnyCPU/net9.0" // Test the --inplace operation Shell.cleanDir sampleRoot @@ -2806,7 +2806,7 @@ module Targets = "Sample24.csproj" |> DotNet.test (fun o -> { o.WithCommon(withWorkingDirectoryVM "Samples/Sample24") with - Framework = Some "net8.0" + Framework = Some "net9.0" Configuration = DotNet.BuildConfiguration.Debug } |> (testWithCLITaggedArguments "AsyncAwaitTests")) @@ -2836,7 +2836,7 @@ module Targets = Path.getFullName "./Samples/Sample24/Sample24.csproj" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample24 + defaultDotNetTestCommandLine (Some "net9.0") sample24 let collect = AltCover.CollectOptions.Primitive @@ -2892,7 +2892,7 @@ module Targets = let sampleRoot = Path.getFullName "./_Binaries/FSAsyncTests_" + sample - + "/Debug+AnyCPU/net8.0" + + "/Debug+AnyCPU/net9.0" // Test the --inplace operation Shell.cleanDir sampleRoot @@ -2900,7 +2900,7 @@ module Targets = sample + ".fsproj" |> DotNet.test (fun o -> { o.WithCommon(withWorkingDirectoryVM ("Samples/" + sample)) with - Framework = Some "net8.0" + Framework = Some "net9.0" Configuration = DotNet.BuildConfiguration.Debug } |> (testWithCLITaggedArguments "FSAsyncTests")) @@ -2939,7 +2939,7 @@ module Targets = + ".fsproj" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sampled + defaultDotNetTestCommandLine (Some "net9.0") sampled let collect = AltCover.CollectOptions.Primitive @@ -2996,10 +2996,10 @@ module Targets = @@ ("AltCoverFSharpTypesDotNetRunner.xml") let sampleRoot = - Path.getFullName "_Binaries/Sample2/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample2/Debug+AnyCPU/net9.0" let instrumented = - Path.getFullName "_Binaries/FSharpTypesDotNetRunner_Sample2/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/FSharpTypesDotNetRunner_Sample2/Debug+AnyCPU/net9.0" // Instrument the code let prep = @@ -3035,7 +3035,7 @@ module Targets = Path.getFullName "./Samples/Sample2/Sample2.fsproj" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample2 + defaultDotNetTestCommandLine (Some "net9.0") sample2 let collect = AltCover.CollectOptions.Primitive @@ -3082,7 +3082,7 @@ module Targets = let sampleRoot = Path.getFullName - "_Binaries/FSharpTypesDotNetCollecter_Sample2/Debug+AnyCPU/net8.0" + "_Binaries/FSharpTypesDotNetCollecter_Sample2/Debug+AnyCPU/net9.0" printfn "Build and test normally" Shell.cleanDir sampleRoot @@ -3090,7 +3090,7 @@ module Targets = "Sample2.fsproj" |> DotNet.test (fun o -> { o.WithCommon(withWorkingDirectoryVM "Samples/Sample2") with - Framework = Some "net8.0" + Framework = Some "net9.0" Configuration = DotNet.BuildConfiguration.Debug } |> (testWithCLITaggedArguments "FSharpTypesDotNetCollecter")) @@ -3135,7 +3135,7 @@ module Targets = "Sample2.fsproj" |> DotNet.test (fun o -> { o.WithCommon(withWorkingDirectoryVM "Samples/Sample2") with - Framework = Some "net8.0" + Framework = Some "net9.0" Configuration = DotNet.BuildConfiguration.Debug NoBuild = true } |> (testWithCLITaggedArguments "FSharpTypesDotNetCollecter")) @@ -3331,7 +3331,7 @@ module Targets = Path.getFullName "./_Binaries/Sample1/__Instrumented.CSharpDotNetWithDotNet" let i = - Path.getFullName "./_Binaries/Sample1/Debug+AnyCPU/net8.0" + Path.getFullName "./_Binaries/Sample1/Debug+AnyCPU/net9.0" let prep = AltCover.PrepareOptions.Primitive( @@ -3374,7 +3374,7 @@ module Targets = Path.getFullName "_Binaries/AltCover/Release+AnyCPU/net472" let sampleRoot = - Path.getFullName "_Binaries/Sample1/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample1/Debug+AnyCPU/net9.0" let instrumented = Path.getFullName "_Binaries/Sample1/__Instrumented.CSharpDotNetWithFramework" @@ -3676,7 +3676,7 @@ module Targets = Path.getFullName "_Binaries/AltCover/Release+AnyCPU/net7.0" let sampleRoot = - Path.getFullName "_Binaries/Sample8/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample8/Debug+AnyCPU/net9.0" let instrumented = "__RecordResumeTestDotNet" @@ -4752,7 +4752,7 @@ module Targets = @@ ("ReleaseDotNetWithFramework.xml") let sampleRoot = - Path.getFullName "./_Binaries/Sample1/Debug+AnyCPU/net8.0" + Path.getFullName "./_Binaries/Sample1/Debug+AnyCPU/net9.0" let instrumented = sampleRoot @@ -4841,7 +4841,7 @@ module Targets = Path.getFullName "./_Binaries/Sample1/__Instrumented.ReleaseDotNetWithDotNet" let i = - Path.getFullName "./_Binaries/Sample1/Debug+AnyCPU/net8.0" + Path.getFullName "./_Binaries/Sample1/Debug+AnyCPU/net9.0" let prep = AltCover.PrepareOptions.Primitive( @@ -4883,10 +4883,10 @@ module Targets = let o = Path.getFullName - "./_Binaries/ReleaseFSharpTypesDotNetRunner_Sample2/Debug+AnyCPU/net8.0" + "./_Binaries/ReleaseFSharpTypesDotNetRunner_Sample2/Debug+AnyCPU/net9.0" let i = - Path.getFullName "_Binaries/Sample2/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample2/Debug+AnyCPU/net9.0" Shell.cleanDir o @@ -4927,7 +4927,7 @@ module Targets = Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample2 + defaultDotNetTestCommandLine (Some "net9.0") sample2 // Run let collect = @@ -4962,10 +4962,10 @@ module Targets = let o = Path.getFullName - "./_Binaries/ReleaseFSharpTypesX86DotNetRunner_Sample2/Debug+x86/net8.0" + "./_Binaries/ReleaseFSharpTypesX86DotNetRunner_Sample2/Debug+x86/net9.0" let i = - Path.getFullName "_Binaries/Sample2/Debug+x86/net8.0" + Path.getFullName "_Binaries/Sample2/Debug+x86/net9.0" Shell.cleanDir o @@ -5029,7 +5029,7 @@ module Targets = // Run let (dotnetexe, args) = - defaultDotNetTestCommandLine86 (Some "net8.0") sample2 + defaultDotNetTestCommandLine86 (Some "net9.0") sample2 let collect = AltCover.CollectOptions.Primitive @@ -5066,10 +5066,10 @@ module Targets = let o = Path.getFullName - "./_Binaries/ReleaseXUnitFSharpTypesDotNetRunner_Sample4/Debug+AnyCPU/net8.0" + "./_Binaries/ReleaseXUnitFSharpTypesDotNetRunner_Sample4/Debug+AnyCPU/net9.0" let i = - Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net9.0" Shell.cleanDir o @@ -5106,7 +5106,7 @@ module Targets = Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample4 + defaultDotNetTestCommandLine (Some "net9.0") sample4 // Run let collect = @@ -5143,10 +5143,10 @@ module Targets = Path.getFullName "./_Reports/OpenCoverForPester/OpenCoverForPester.xml" let o = - Path.getFullName "./_Binaries/OpenCoverForPester_Sample18/Debug+AnyCPU/net8.0" + Path.getFullName "./_Binaries/OpenCoverForPester_Sample18/Debug+AnyCPU/net9.0" let i = - Path.getFullName "_Binaries/Sample18/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample18/Debug+AnyCPU/net9.0" Shell.cleanDir o @@ -5183,7 +5183,7 @@ module Targets = Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample + defaultDotNetTestCommandLine (Some "net9.0") sample // Run let collect = @@ -5231,7 +5231,7 @@ module Targets = Shell.copyFile target covxml let binary = - "_Binaries/CoverletForPester_Sample18/Debug+AnyCPU/net8.0/Sample18.dll" + "_Binaries/CoverletForPester_Sample18/Debug+AnyCPU/net9.0/Sample18.dll" let binaryTarget = reportDir @@ "Sample18.dll" @@ -5239,7 +5239,7 @@ module Targets = Shell.copyFile binaryTarget binary let binary2 = - "_Binaries/CoverletForPester_Sample18/Debug+AnyCPU/net8.0/Sample18.pdb" + "_Binaries/CoverletForPester_Sample18/Debug+AnyCPU/net9.0/Sample18.pdb" let binary2Target = reportDir @@ "Sample18.pdb" @@ -5267,10 +5267,10 @@ module Targets = let o = Path.getFullName - "./_Binaries/ReleaseXUnitFSharpTypesShowVisualized_Sample4/Debug+AnyCPU/net8.0" + "./_Binaries/ReleaseXUnitFSharpTypesShowVisualized_Sample4/Debug+AnyCPU/net9.0" let i = - Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net9.0" Shell.cleanDir o @@ -5470,7 +5470,7 @@ module Targets = Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample4 + defaultDotNetTestCommandLine (Some "net9.0") sample4 // Run let collect = @@ -5534,10 +5534,10 @@ module Targets = let o = Path.getFullName - "./_Binaries/ReleaseXUnitFSharpTypesDotNetFullRunner_Sample4/Debug+AnyCPU/net8.0" + "./_Binaries/ReleaseXUnitFSharpTypesDotNetFullRunner_Sample4/Debug+AnyCPU/net9.0" let i = - Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net9.0" Shell.cleanDir o let before = Actions.ticksNow () @@ -5574,7 +5574,7 @@ module Targets = Path.getFullName "_Packaging/Unpack/tools/net7.0/AltCover.dll" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample4 + defaultDotNetTestCommandLine (Some "net9.0") sample4 // Run let collect = @@ -5606,10 +5606,10 @@ module Targets = Path.getFullName "./_Reports/JsonReporting.json" let o = - Path.getFullName "./_Binaries/JsonReporting_Sample4/Debug+AnyCPU/net8.0" + Path.getFullName "./_Binaries/JsonReporting_Sample4/Debug+AnyCPU/net9.0" let i = - Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net8.0" + Path.getFullName "_Binaries/Sample4/Debug+AnyCPU/net9.0" Shell.cleanDir o let before = Actions.ticksNow () @@ -5682,7 +5682,7 @@ module Targets = Path.getFullName "_Packaging/Unpack/tools/net472/AltCover.exe" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") sample4 + defaultDotNetTestCommandLine (Some "net9.0") sample4 // Run let collect = @@ -5885,7 +5885,8 @@ module Targets = fsproj.Descendants(XName.Get("TargetFrameworks")) |> Seq.head - targets.SetValue "net8.0" + targets.SetValue "net9.0" + targets.Name <- (XName.Get("TargetFramework")) let pack = fsproj.Descendants(XName.Get("PackageReference")) @@ -5978,7 +5979,7 @@ module Targets = + script + "." + cv - + ".net8.0.xml" + + ".xml" ) Actions.CheckSample4 before x @@ -6055,7 +6056,8 @@ module Targets = fsproj.Descendants(XName.Get("TargetFrameworks")) |> Seq.head - let netTarget = "net8.0" + let netTarget = "net9.0" + targets.Name <- (XName.Get("TargetFramework")) targets.SetValue netTarget @@ -6140,11 +6142,7 @@ module Targets = "running fake script returned with a non-zero exit code" let x = - Path.getFullName ( - "./_ApiUse/_DotnetTest/coverage." - + netTarget - + ".xml" - ) + Path.getFullName ("./_ApiUse/_DotnetTest/coverage.xml") Actions.CheckSample4 before x finally @@ -6210,7 +6208,8 @@ module Targets = |> Seq.concat |> Seq.head - targets.SetValue "net8.0" + targets.SetValue "net9.0" + targets.Name <- (XName.Get("TargetFramework")) targets.AddAfterSelf(XElement(XName.Get "DocumentationFile")) fsproj.Descendants(XName.Get("HintPath")) @@ -6287,7 +6286,7 @@ module Targets = "_DotnetTest.fsproj" assertCopied ( - "_Binaries/_DotnetTest/Debug+AnyCPU/net8.0/__Instrumented__DotnetTest" + "_Binaries/_DotnetTest/Debug+AnyCPU/net9.0/__Instrumented__DotnetTest" ) DotNet.test @@ -6304,11 +6303,11 @@ module Targets = "_DotnetTestJson.fsproj" // TODO validate output as per JsonReporting assertCopied ( - "_Binaries/_DotnetTestJson/Debug+AnyCPU/net8.0/__Instrumented__DotnetTestJson" + "_Binaries/_DotnetTestJson/Debug+AnyCPU/net9.0/__Instrumented__DotnetTestJson" ) let x = - Path.getFullName "./_DotnetTest/coverage.net8.0.xml" + Path.getFullName "./_DotnetTest/coverage.xml" Actions.CheckSample4 before x @@ -6326,7 +6325,7 @@ module Targets = "_DotnetTestInPlace.fsproj" let x = - Path.getFullName "./_DotnetTestInPlace/coverage.net8.0.xml" + Path.getFullName "./_DotnetTestInPlace/coverage.xml" Actions.CheckSample4 before x @@ -6383,10 +6382,10 @@ module Targets = Assert.That(xx0 |> File.Exists |> not, xx0 + " should not be present") Assert.That( - "./_DotnetTestFailInstrumentation/bin/Debug/net8.0/dotnettest.dll.txt" + "./_DotnetTestFailInstrumentation/bin/Debug/net9.0/dotnettest.dll.txt" |> File.Exists |> not, - "./_DotnetTestFailInstrumentation/bin/Debug/net8.0/dotnettest.dll.txt should not be present" + "./_DotnetTestFailInstrumentation/bin/Debug/net9.0/dotnettest.dll.txt should not be present" ) try @@ -6409,10 +6408,10 @@ module Targets = Assert.That(xx0a |> File.Exists |> not, xx0a + " should not be present") Assert.That( - "./_DotnetTestFailInstrumentationInPlace/bin/Debug/net8.0/dotnettest.dll.txt" + "./_DotnetTestFailInstrumentationInPlace/bin/Debug/net9.0/dotnettest.dll.txt" |> File.Exists |> not, - "./_DotnetTestFailInstrumentationInPlace/bin/Debug/net8.0/dotnettest.dll.txt should not be present" + "./_DotnetTestFailInstrumentationInPlace/bin/Debug/net9.0/dotnettest.dll.txt should not be present" ) printfn "optest failing test ------------------------------------------------" @@ -6461,9 +6460,9 @@ module Targets = printfn "Caught expected exception" Assert.That( - "./_Binaries/_DotnetTestFail/Debug+AnyCPU/net8.0/_DotnetTestFail.dll.txt" + "./_Binaries/_DotnetTestFail/Debug+AnyCPU/net9.0/_DotnetTestFail.dll.txt" |> File.Exists, - "./_Binaries/_DotnetTestFail/Debug+AnyCPU/net8.0/_DotnetTestFail.dll.txt should exist" + "./_Binaries/_DotnetTestFail/Debug+AnyCPU/net9.0/_DotnetTestFail.dll.txt should exist" ) do @@ -6510,7 +6509,7 @@ module Targets = let filepath = Path.GetFullPath - "./_Binaries/_DotnetTestFailInPlace/Debug+AnyCPU/net8.0/_DotnetTestFailInPlace.dll.txt" + "./_Binaries/_DotnetTestFailInPlace/Debug+AnyCPU/net9.0/_DotnetTestFailInPlace.dll.txt" Assert.That(filepath |> File.Exists, filepath + " should exist") @@ -6589,9 +6588,9 @@ module Targets = printfn "Caught expected exception" Assert.That( - "./_Binaries/_DotnetTestFailFast/Debug+AnyCPU/net8.0/_DotnetTestFailFast.dll.txt" + "./_Binaries/_DotnetTestFailFast/Debug+AnyCPU/net9.0/_DotnetTestFailFast.dll.txt" |> File.Exists, - "./_Binaries/_DotnetTestFailFast/Debug+AnyCPU/net8.0/_DotnetTestFailFast.dll.txt should exist" + "./_Binaries/_DotnetTestFailFast/Debug+AnyCPU/net9.0/_DotnetTestFailFast.dll.txt should exist" ) do @@ -6637,9 +6636,9 @@ module Targets = printfn "Caught expected exception" Assert.That( - "./_Binaries/_DotnetTestFailFastInPlace/Debug+AnyCPU/net8.0/_DotnetTestFailFastInPlace.dll.txt" + "./_Binaries/_DotnetTestFailFastInPlace/Debug+AnyCPU/net9.0/_DotnetTestFailFastInPlace.dll.txt" |> File.Exists, - "./_Binaries/_DotnetTestFailFastInPlace/Debug+AnyCPU/net8.0/_DotnetTestFailFastInPlace.dll.txt should exist" + "./_Binaries/_DotnetTestFailFastInPlace/Debug+AnyCPU/net9.0/_DotnetTestFailFastInPlace.dll.txt should exist" ) do @@ -7201,7 +7200,7 @@ module Targets = csproj.Descendants(XName.Get("TargetFramework")) |> Seq.head - target.SetValue "net8.0" + target.SetValue "net9.0" let pack = csproj.Descendants(XName.Get("PackageReference")) @@ -7573,8 +7572,9 @@ module Targets = fsproj.Descendants(XName.Get("TargetFrameworks")) |> Seq.head - targets.SetValue "net8.0" + targets.SetValue "net9.0" targets.AddAfterSelf(XElement(XName.Get "DocumentationFile")) + targets.Name <- (XName.Get("TargetFramework")) fsproj.Descendants(XName.Get("HintPath")) |> Seq.iter (fun hint -> @@ -7621,7 +7621,7 @@ module Targets = Path.getFullName "./_Reports/DotnetGlobalIntegration.xml" let o = - Path.getFullName "./_Binaries/_DotnetGlobalTest/Debug+AnyCPU/net8.0" + Path.getFullName "./_Binaries/_DotnetGlobalTest/Debug+AnyCPU/net9.0" let r = Path.Combine(o, Path.GetFileName x) @@ -7660,7 +7660,7 @@ module Targets = printfn "Execute the instrumented tests" let (dotnetexe, args) = - defaultDotNetTestCommandLine (Some "net8.0") String.Empty + defaultDotNetTestCommandLine (Some "net9.0") String.Empty let collect = AltCover.CollectOptions.Primitive @@ -8077,6 +8077,24 @@ module Targets = let o2expect = [ // embeds + "_ApiUse/_DotnetTest/coverage.xml" + "_DotnetTestJson/coverage.xml" + "_Issue114/coverage.xml" + "_Reports/ApiTestWithAltCoverCoreRunner.net9.0.xml" + "_Reports/DotnetGlobalIntegration.xml" + "_Reports/MonitorTestWithAltCoverCoreRunner.net9.0.xml" + "_Reports/ValidateGendarmeEmulationUnitTestWithAltCoverCoreRunner.net9.0.xml" + "_Reports/RecorderTestWithAltCoverCoreRunner.net9.0.xml" + "_Reports/VisualizerTestWithAltCoverCoreRunner.net9.0.xml" + "_DotnetTest/coverage.xml" + "_Binaries/_DotnetGlobalTest/Debug+AnyCPU/net9.0/DotnetGlobalIntegration.xml" + "_Cake/_DotnetTest/coverage.build.cake.--version 2.0.0.xml" + "_Cake/_DotnetTest/coverage.build.cake.Latest.xml" + "_DotnetTestFail/coverage.xml" + "_DotnetTestFailFast/coverage.xml" + "_DotnetTestFailFastInPlace/coverage.xml" + "_DotnetTestFailInPlace/coverage.xml" + "_DotnetTestInPlace/coverage.xml" "__AltCover.Api.Tests/OpenCover.xml" "AltCover.Api.Tests/OpenCover.xml" "_DotnetTestBranchCover/coverage.xml" diff --git a/Demo/Echo/Echo/Echo.csproj b/Demo/Echo/Echo/Echo.csproj index a269962b5..92e46ddac 100644 --- a/Demo/Echo/Echo/Echo.csproj +++ b/Demo/Echo/Echo/Echo.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 diff --git a/Demo/Echo/Test/Test.csproj b/Demo/Echo/Test/Test.csproj index 28af30b64..38dad9b3c 100644 --- a/Demo/Echo/Test/Test.csproj +++ b/Demo/Echo/Test/Test.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false diff --git a/Demo/MultiTest/Test1/Test1.fsproj b/Demo/MultiTest/Test1/Test1.fsproj index acb6ec006..aa421060f 100644 --- a/Demo/MultiTest/Test1/Test1.fsproj +++ b/Demo/MultiTest/Test1/Test1.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false diff --git a/Demo/MultiTest/Test2/Test2.fsproj b/Demo/MultiTest/Test2/Test2.fsproj index ec8c9525e..b90e63e26 100644 --- a/Demo/MultiTest/Test2/Test2.fsproj +++ b/Demo/MultiTest/Test2/Test2.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false diff --git a/RegressionTesting/SoakTest1/SoakTest1.fsproj b/RegressionTesting/SoakTest1/SoakTest1.fsproj index 547054db8..356ab2b79 100644 --- a/RegressionTesting/SoakTest1/SoakTest1.fsproj +++ b/RegressionTesting/SoakTest1/SoakTest1.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 diff --git a/RegressionTesting/issue20/xunit-tests/xunit-tests.xml b/RegressionTesting/issue20/xunit-tests/xunit-tests.xml index e77e31f58..315913f83 100644 --- a/RegressionTesting/issue20/xunit-tests/xunit-tests.xml +++ b/RegressionTesting/issue20/xunit-tests/xunit-tests.xml @@ -1,7 +1,7 @@ - net8.0 + net9.0 xunit_tests Major false diff --git a/Samples/Sample1/Sample1.csproj b/Samples/Sample1/Sample1.csproj index 5ce37ea51..a545deca1 100644 --- a/Samples/Sample1/Sample1.csproj +++ b/Samples/Sample1/Sample1.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net20 + net9.0;net20 Sample1 false diff --git a/Samples/Sample10/Sample10.csproj b/Samples/Sample10/Sample10.csproj index 88a32b0c4..0c1c681d5 100644 --- a/Samples/Sample10/Sample10.csproj +++ b/Samples/Sample10/Sample10.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false diff --git a/Samples/Sample12/Sample12.csproj b/Samples/Sample12/Sample12.csproj index c284f2576..df253b0a0 100644 --- a/Samples/Sample12/Sample12.csproj +++ b/Samples/Sample12/Sample12.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net472 + net9.0;net472 Sample12 diff --git a/Samples/Sample13/Sample13.fsproj b/Samples/Sample13/Sample13.fsproj index 4ab131aa0..6cddd92a3 100644 --- a/Samples/Sample13/Sample13.fsproj +++ b/Samples/Sample13/Sample13.fsproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false diff --git a/Samples/Sample14/Sample14/Sample14.csproj b/Samples/Sample14/Sample14/Sample14.csproj index 27aa2dc7e..fbbb05347 100644 --- a/Samples/Sample14/Sample14/Sample14.csproj +++ b/Samples/Sample14/Sample14/Sample14.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 diff --git a/Samples/Sample16/Test/Test/Test.csproj b/Samples/Sample16/Test/Test/Test.csproj index 7866b0400..043986347 100644 --- a/Samples/Sample16/Test/Test/Test.csproj +++ b/Samples/Sample16/Test/Test/Test.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Major false diff --git a/Samples/Sample17/Sample17.fsproj b/Samples/Sample17/Sample17.fsproj index 5f5c1ec09..d841eb3cd 100644 --- a/Samples/Sample17/Sample17.fsproj +++ b/Samples/Sample17/Sample17.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 Sample17 diff --git a/Samples/Sample2/Sample2.fsproj b/Samples/Sample2/Sample2.fsproj index 194db6f9d..228651af2 100644 --- a/Samples/Sample2/Sample2.fsproj +++ b/Samples/Sample2/Sample2.fsproj @@ -1,7 +1,7 @@  - net8.0;net472 + net9.0;net472 Sample2 $(AssetTargetFallback);netcoreapp1.0; false diff --git a/Samples/Sample21/Sample21.csproj b/Samples/Sample21/Sample21.csproj index b37d6c9d7..8e94b914b 100644 --- a/Samples/Sample21/Sample21.csproj +++ b/Samples/Sample21/Sample21.csproj @@ -1,8 +1,8 @@ - + - net8.0;net472 + net9.0;net472 false diff --git a/Samples/Sample23/Sample23.csproj b/Samples/Sample23/Sample23.csproj index 9571c4904..964b4e9ac 100644 --- a/Samples/Sample23/Sample23.csproj +++ b/Samples/Sample23/Sample23.csproj @@ -1,7 +1,7 @@ - net472;net8.0 + net472;net9.0 false diff --git a/Samples/Sample24/Sample24.csproj b/Samples/Sample24/Sample24.csproj index 1fe5cc7d7..ed11343d6 100644 --- a/Samples/Sample24/Sample24.csproj +++ b/Samples/Sample24/Sample24.csproj @@ -1,7 +1,7 @@ - net472;net8.0 + net472;net9.0 false diff --git a/Samples/Sample26/Sample26.fsproj b/Samples/Sample26/Sample26.fsproj index 30a543b4d..deee40114 100644 --- a/Samples/Sample26/Sample26.fsproj +++ b/Samples/Sample26/Sample26.fsproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Sample26 false AnyCPU diff --git a/Samples/Sample27/Sample27.fsproj b/Samples/Sample27/Sample27.fsproj index cbb8b3229..4bb299078 100644 --- a/Samples/Sample27/Sample27.fsproj +++ b/Samples/Sample27/Sample27.fsproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net9.0 false false diff --git a/Samples/Sample30/Sample30.fsproj b/Samples/Sample30/Sample30.fsproj index cbb8b3229..4bb299078 100644 --- a/Samples/Sample30/Sample30.fsproj +++ b/Samples/Sample30/Sample30.fsproj @@ -1,7 +1,7 @@  - net472;net8.0 + net472;net9.0 false false diff --git a/Samples/Sample32/Sample32.csproj b/Samples/Sample32/Sample32.csproj index 79f9caca1..40158812a 100644 --- a/Samples/Sample32/Sample32.csproj +++ b/Samples/Sample32/Sample32.csproj @@ -2,7 +2,7 @@ Exe - net472;net8.0 + net472;net9.0 diff --git a/Samples/Sample4/Sample4.fsproj b/Samples/Sample4/Sample4.fsproj index 456fcda6f..74c635163 100644 --- a/Samples/Sample4/Sample4.fsproj +++ b/Samples/Sample4/Sample4.fsproj @@ -2,7 +2,7 @@ - net8.0;net472 + net9.0;net472 false Sample4 false diff --git a/Samples/Sample4/Sample4LongForm.fsproj b/Samples/Sample4/Sample4LongForm.fsproj index f74f671fe..29306d64e 100644 --- a/Samples/Sample4/Sample4LongForm.fsproj +++ b/Samples/Sample4/Sample4LongForm.fsproj @@ -63,8 +63,8 @@ - - + + diff --git a/Samples/Sample6/Sample6.fsproj b/Samples/Sample6/Sample6.fsproj index 851f17efc..f94da2ce3 100644 --- a/Samples/Sample6/Sample6.fsproj +++ b/Samples/Sample6/Sample6.fsproj @@ -1,11 +1,11 @@  - net8.0;net472 + net9.0;net472 Sample6 - + 52;44 diff --git a/Samples/Sample7/Sample7.fsproj b/Samples/Sample7/Sample7.fsproj index f3564be99..239a831c6 100644 --- a/Samples/Sample7/Sample7.fsproj +++ b/Samples/Sample7/Sample7.fsproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Sample7 false diff --git a/Samples/Sample8/Sample8.csproj b/Samples/Sample8/Sample8.csproj index 93336d721..dba6bc311 100644 --- a/Samples/Sample8/Sample8.csproj +++ b/Samples/Sample8/Sample8.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net20 + net9.0;net20 Sample8 $(ProjectDir)../../AltCover/AltCover.ico embedded diff --git a/global.json b/global.json index 8d0a1c0ac..42b8acba7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.300", + "version": "9.0.100-preview.6.24328.19", "rollForward": "latestMinor" } } \ No newline at end of file