Absolute minimum for net9.0

SteveGilham · Nov 13, 2024 · 6dba794 · 6dba794
1 parent 34e2ebd
commit 6dba794
Show file tree

Hide file tree

Showing 19 changed files with 141 additions and 138 deletions.
diff --git 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
@@ -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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>AltCover.Visualizer</RootNamespace>
     <AssemblyName>AltCover.Visualizer</AssemblyName>
     <PackAsTool>True</PackAsTool>

diff --git a/AltCover.Avalonia/AltCover.Avalonia11.fsproj b/AltCover.Avalonia/AltCover.Avalonia11.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>AltCover.Visualizer</RootNamespace>
     <AssemblyName>AltCover.Visualizer</AssemblyName>
     <PackAsTool>True</PackAsTool>
@@ -28,10 +28,10 @@
     <AvaloniaResource Include="AltCover.App11.xaml">
       <LogicalName>AltCover.App.xaml</LogicalName>
     </AvaloniaResource>
-    
+
     <AvaloniaResource Include="AltCover.AboutBox.xaml">
       <LogicalName>AltCover.AboutBox.xaml</LogicalName>
-    </AvaloniaResource>    
+    </AvaloniaResource>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AltCover.Cake/AltCover.Cake.csproj b/AltCover.Cake/AltCover.Cake.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>AltCover.Cake</RootNamespace>
     <AssemblyName>AltCover.Cake</AssemblyName>

diff --git 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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>AltCover.Visualizer</RootNamespace>
     <AssemblyName>AltCover.Visualizer</AssemblyName>
     <PackAsTool>True</PackAsTool>
@@ -29,7 +29,7 @@
     <None Include="Prepare.ps1" />
     <Compile Include="..\_Generated\VisibleToTest.fs" Link="VisibleToTest.fs" />
     <Compile Include="..\_Generated\AssemblyVersion.fs" Link="AssemblyVersion.fs" />
-    <EmbeddedResource Include="Visualizer3.glade"/>
+    <EmbeddedResource Include="Visualizer3.glade" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Browser.fs" />
     <Compile Include="Persistence.fs" />

diff --git a/AltCover/AltCover.fsproj b/AltCover/AltCover.fsproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks Condition="'$(Configuration)'=='Debug'">net7.0;netstandard2.0;net472</TargetFrameworks>
-    <TargetFrameworks Condition="'$(Configuration)'!='Debug'">net7.0;net472</TargetFrameworks>
-    <ToolCommandName Condition="'$(TargetFramework)' == 'net7.0'">altcover</ToolCommandName>
-    <PackAsTool Condition="'$(TargetFramework)' == 'net7.0'">True</PackAsTool>
+    <TargetFrameworks Condition="'$(Configuration)'=='Debug'">net8.0;netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(Configuration)'!='Debug'">net8.0;net472</TargetFrameworks>
+    <ToolCommandName Condition="'$(TargetFramework)' == 'net8.0'">altcover</ToolCommandName>
+    <PackAsTool Condition="'$(TargetFramework)' == 'net8.0'">True</PackAsTool>
     <RootNamespace>AltCover</RootNamespace>
     <AssemblyName>AltCover</AssemblyName>
     <ApplicationIcon>AltCover.ico</ApplicationIcon>
@@ -25,7 +25,7 @@
     <DefineConstants Condition="'$(TargetFramework)' != 'net472'">TRACE;GLOBALTOOL</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <None Include="DotnetToolSettings.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/Build/DriveApi.fsproj b/Build/DriveApi.fsproj
@@ -16,7 +16,7 @@
     <PackageReference Include="AltCover.Fake" VersionOverride="8.6.14" />
     <PackageReference Include="Fake.Core.Target" />
     <PackageReference Include="Fake.DotNet.Cli" />
-    <PackageReference Include="System.Collections.Immutable" VersionOverride="8.0.0" />
+    <PackageReference Include="System.Collections.Immutable" VersionOverride="9.0.0" />
     <PackageReference Include="Unquote" />
   </ItemGroup>
 </Project>
diff --git 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
@@ -1,8 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask TaskName="AltCover.Prepare"
-        AssemblyFile="$(MSBuildThisFileDirectory)../_Packaging/Unpack/tools/net7.0/AltCover.Engine.dll" />
+        AssemblyFile="$(MSBuildThisFileDirectory)../_Packaging/Unpack/tools/net8.0/AltCover.Engine.dll" />
   <UsingTask TaskName="AltCover.Collect"
-        AssemblyFile="$(MSBuildThisFileDirectory)../_Packaging/Unpack/tools/net7.0/AltCover.Engine.dll" />
+        AssemblyFile="$(MSBuildThisFileDirectory)../_Packaging/Unpack/tools/net8.0/AltCover.Engine.dll" />
 
   <ItemGroup>
     <CallContext Include="0" />