Skip to content

Commit

Permalink
Burn more bridges - this is the net9.0 stream
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveGilham committed Jul 27, 2024
1 parent 5855e18 commit 98d54a9
Show file tree
Hide file tree
Showing 49 changed files with 200 additions and 180 deletions.
2 changes: 1 addition & 1 deletion AltCover.Api.Tests/AltCover.Api.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>AltCover.Api.Tests</AssemblyName>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<DefineConstants>DEBUG;TRACE;EXPECTO_MAIN</DefineConstants>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>AltCover.Monitor.Tests</AssemblyName>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Monitor.Tests/MonitorTest.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>AltCover.Recorder.Tests</AssemblyName>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>AltCover.Recorder2.Tests</AssemblyName>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Tests/AltCover.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>AltCover.Tests</AssemblyName>
<ExtraDefines Condition="'$(OS)' != 'Windows_NT' AND '$(TargetFramework)' == 'net472'">MONO</ExtraDefines>
Expand Down
16 changes: 8 additions & 8 deletions AltCover.Tests/AltCoverFSharpTypes.n3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<Methods>
<Method visited="true" cyclomaticComplexity="5" nPathComplexity="0" sequenceCoverage="37.5" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="11.1">
<Summary numSequencePoints="8" visitedSequencePoints="3" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="37.5" branchCoverage="0" maxCyclomaticComplexity="5" minCyclomaticComplexity="5" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="11.1" maxCrapScore="11.1" />
<MetadataToken>100663319</MetadataToken>
<MetadataToken>100663320</MetadataToken>
<Name>Tests.DU/MyUnion Tests.DU/MyUnion::as_bar()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -93,7 +93,7 @@
</Method>
<Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="true" isSetter="false" crapScore="2">
<Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="2" maxCrapScore="2" />
<MetadataToken>100663320</MetadataToken>
<MetadataToken>100663321</MetadataToken>
<Name>Microsoft.FSharp.Core.FSharpFunc`2&lt;Microsoft.FSharp.Core.Unit,Tests.DU/MyUnion&gt; Tests.DU/MyUnion::get_MyBar()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -110,11 +110,11 @@
<Methods>
<Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="2">
<Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="2" maxCrapScore="2" />
<MetadataToken>100663340</MetadataToken>
<MetadataToken>100663341</MetadataToken>
<Name>Tests.DU/MyUnion Tests.DU/get_MyBar@46::Invoke(Microsoft.FSharp.Core.Unit)</Name>
<SequencePoints />
<BranchPoints />
<MethodPoint vc="0" uspid="100663340" ordinal="0" offset="0" />
<MethodPoint vc="0" uspid="100663341" ordinal="0" offset="0" />
</Method>
</Methods>
</Class>
Expand All @@ -124,7 +124,7 @@
<Methods>
<Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="2">
<Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="2" maxCrapScore="2" />
<MetadataToken>100663341</MetadataToken>
<MetadataToken>100663342</MetadataToken>
<Name>System.Void Tests.DU/MyClass::.ctor()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -141,7 +141,7 @@
<Methods>
<Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="true" isGetter="false" isSetter="false" crapScore="1">
<Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" />
<MetadataToken>100663344</MetadataToken>
<MetadataToken>100663345</MetadataToken>
<Name>Tests.M/Thing Tests.M::makeThing(System.String)</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -152,7 +152,7 @@
</Method>
<Method visited="true" cyclomaticComplexity="5" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="true" isGetter="false" isSetter="false" crapScore="5">
<Summary numSequencePoints="2" visitedSequencePoints="2" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="5" minCyclomaticComplexity="5" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="5" maxCrapScore="5" />
<MetadataToken>100663345</MetadataToken>
<MetadataToken>100663346</MetadataToken>
<Name>System.Void Tests.M::testMakeThing()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -170,7 +170,7 @@
<Methods>
<Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1">
<Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" />
<MetadataToken>100663355</MetadataToken>
<MetadataToken>100663357</MetadataToken>
<Name>System.Byte[] Tests.M/Thing::bytes()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand Down
14 changes: 7 additions & 7 deletions AltCover.Tests/OpenCoverForPester.coverlet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<Methods>
<Method visited="true" cyclomaticComplexity="5" nPathComplexity="5" sequenceCoverage="37.5" branchCoverage="33.33" isConstructor="False" isGetter="False" isSetter="False" isStatic="True" crapScore="11.1">
<Summary numSequencePoints="8" visitedSequencePoints="3" numBranchPoints="5" visitedBranchPoints="2" sequenceCoverage="37.5" branchCoverage="33.33" maxCyclomaticComplexity="5" minCyclomaticComplexity="5" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="11.1" maxCrapScore="11.1" />
<MetadataToken>100663323</MetadataToken>
<MetadataToken>100663324</MetadataToken>
<Name>Tests.DU/MyUnion Tests.DU/MyUnion::AsBar()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -177,7 +177,7 @@
</Method>
<Method visited="false" cyclomaticComplexity="1" nPathComplexity="1" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True" crapScore="2">
<Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="2" maxCrapScore="2" />
<MetadataToken>100663324</MetadataToken>
<MetadataToken>100663325</MetadataToken>
<Name>Microsoft.FSharp.Core.FSharpFunc`2&lt;Microsoft.FSharp.Core.Unit,Tests.DU/MyUnion&gt; Tests.DU/MyUnion::get_MyBar()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -194,7 +194,7 @@
<Methods>
<Method visited="false" cyclomaticComplexity="1" nPathComplexity="1" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True" crapScore="2">
<Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="2" maxCrapScore="2" />
<MetadataToken>100663346</MetadataToken>
<MetadataToken>100663347</MetadataToken>
<Name>System.Int32 Tests.DU/MyClass::get_Property()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -211,7 +211,7 @@
<Methods>
<Method visited="false" cyclomaticComplexity="1" nPathComplexity="1" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True" crapScore="2">
<Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="2" maxCrapScore="2" />
<MetadataToken>100663355</MetadataToken>
<MetadataToken>100663356</MetadataToken>
<Name>System.Tuple`2&lt;System.Double,System.Double&gt; Tests.DU/compute@74::Invoke(System.Double,System.Double,System.Double)</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -228,7 +228,7 @@
<Methods>
<Method visited="true" cyclomaticComplexity="1" nPathComplexity="1" sequenceCoverage="100" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True" crapScore="1">
<Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" />
<MetadataToken>100663361</MetadataToken>
<MetadataToken>100663362</MetadataToken>
<Name>Tests.M/Thing Tests.M::makeThing(System.String)</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -239,7 +239,7 @@
</Method>
<Method visited="true" cyclomaticComplexity="8" nPathComplexity="16" sequenceCoverage="100" branchCoverage="55.56" isConstructor="False" isGetter="False" isSetter="False" isStatic="True" crapScore="8">
<Summary numSequencePoints="2" visitedSequencePoints="2" numBranchPoints="8" visitedBranchPoints="5" sequenceCoverage="100" branchCoverage="55.56" maxCyclomaticComplexity="8" minCyclomaticComplexity="8" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="8" maxCrapScore="8" />
<MetadataToken>100663362</MetadataToken>
<MetadataToken>100663363</MetadataToken>
<Name>System.Void Tests.M::testMakeThing()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand All @@ -266,7 +266,7 @@
<Methods>
<Method visited="true" cyclomaticComplexity="1" nPathComplexity="1" sequenceCoverage="100" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True" crapScore="1">
<Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" />
<MetadataToken>100663372</MetadataToken>
<MetadataToken>100663374</MetadataToken>
<Name>System.Byte[] Tests.M/Thing::Bytes()</Name>
<FileRef uid="1" />
<SequencePoints>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Tests/Runner.Tests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 10 additions & 8 deletions AltCover.Tests/Tests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Tests/Tests3.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Tests/XTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<GendarmeVersion>2024.6.28.12460</GendarmeVersion>
<GendarmeToolDir>..\packages\altcode.gendarme\$(GendarmeVersion)\tools\</GendarmeToolDir>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<GenerateProgramFile>false</GenerateProgramFile>
<AssemblyName>AltCover.Tests.Visualizer</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion Build/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AltCodeTag>$</AltCodeTag>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<Import Project="$(MSBuildThisFileDirectory)\..\Directory.Build.props" />
</Project>
2 changes: 1 addition & 1 deletion Build/DriveApi.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<NoWarn>MSB3243;NU1902,NU1903,NU1904</NoWarn>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 98d54a9

Please sign in to comment.