.NET 9

danielpalme · Nov 7, 2024 · 082122b · 082122b
1 parent 24d447f
commit 082122b
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 84 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ env:
   buildPlatform: Any CPU
   buildConfiguration: Release
   version: 5.3.11
-  dotnetSDKVersion: 8.0.403
+  dotnetSDKVersion: 9.0.100
   nodeVersion: 20
 
 jobs:
@@ -50,30 +50,22 @@ jobs:
     - name: 'Compile Solution'
       run: msbuild '${{ env.solution }}' /p:configuration='${{ env.buildConfiguration }}' /p:platform='${{ env.buildPlatform }}'
 
-    - name: dotnet publish Console.NetCore 6.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net6.0 ReportGenerator.Console.NetCore.csproj
-      working-directory: src/ReportGenerator.Console.NetCore
-
-    - name: dotnet publish Console.NetCore 7.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net7.0 ReportGenerator.Console.NetCore.csproj
-      working-directory: src/ReportGenerator.Console.NetCore
-
     - name: dotnet publish Console.NetCore 8.0
       run: dotnet publish -c ${{ env.BuildConfiguration }} -f net8.0 ReportGenerator.Console.NetCore.csproj
       working-directory: src/ReportGenerator.Console.NetCore
 
-    - name: dotnet publish DotnetGlobalTool 6.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net6.0 ReportGenerator.DotnetGlobalTool.csproj
-      working-directory: src/ReportGenerator.DotnetGlobalTool
-
-    - name: dotnet publish DotnetGlobalTool 7.0
-      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net7.0 ReportGenerator.DotnetGlobalTool.csproj
-      working-directory: src/ReportGenerator.DotnetGlobalTool
+    - name: dotnet publish Console.NetCore 9.0
+      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net9.0 ReportGenerator.Console.NetCore.csproj
+      working-directory: src/ReportGenerator.Console.NetCore
 
     - name: dotnet publish DotnetGlobalTool 8.0
       run: dotnet publish -c ${{ env.BuildConfiguration }} -f net8.0 ReportGenerator.DotnetGlobalTool.csproj
       working-directory: src/ReportGenerator.DotnetGlobalTool
 
+    - name: dotnet publish DotnetGlobalTool 9.0
+      run: dotnet publish -c ${{ env.BuildConfiguration }} -f net9.0 ReportGenerator.DotnetGlobalTool.csproj
+      working-directory: src/ReportGenerator.DotnetGlobalTool
+
     - name: Test
       run: dotnet test src\ReportGenerator.Core.Test\ReportGenerator.Core.Test.csproj --configuration ${{ env.BuildConfiguration }} --no-build /p:CollectCoverage=true /p:DeterministicSourcePaths=true /p:IncludeTestAssembly=true /p:CoverletOutputFormat=opencover%2ccobertura /p:CoverletOutput=../target/reports/coverage/
 
@@ -98,8 +90,8 @@ jobs:
 
     - name: 'Prepare VSIX release: NetCore'
       run: |
-        mkdir src/AzureDevopsTask/ReportGenerator/tools/net6.0
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net6.0\publish' 'src\AzureDevopsTask\ReportGenerator\tools\net6.0' /s
+        mkdir src/AzureDevopsTask/ReportGenerator/tools/net8.0
+        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net8.0\publish' 'src\AzureDevopsTask\ReportGenerator\tools\net8.0' /s
 
     - name: 'Prepare VSIX release: Install TFS Cross Platform Command Line Interface (tfx-cli)'
       run: npm install -g tfx-cli
@@ -120,9 +112,8 @@ jobs:
       run: |
         mkdir tmpzip
         mkdir tmpzip\net47
-        mkdir tmpzip\net6.0
-        mkdir tmpzip\net7.0
         mkdir tmpzip\net8.0
+        mkdir tmpzip\net9.0
 
     - name: 'Prepare ZIP release'
       run: |
@@ -132,9 +123,8 @@ jobs:
         xcopy "src\ReportGenerator.Console\bin\Release\*.dll" "tmpzip\net47"
         xcopy "src\ReportGenerator.Console\bin\Release\ReportGenerator.exe" "tmpzip\net47"
         xcopy "src\ReportGenerator.Console\bin\Release\ReportGenerator.exe.config" "tmpzip\net47"
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net6.0\publish\*' 'tmpzip\net6.0' /s
-        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net7.0\publish\*' 'tmpzip\net7.0' /s
         xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net8.0\publish\*' 'tmpzip\net8.0' /s
+        xcopy 'src\ReportGenerator.Console.NetCore\bin\Release\net9.0\publish\*' 'tmpzip\net9.0' /s
 
     - name: 'Pack ZIP release'
       run: Compress-Archive -Path tmpzip/* -DestinationPath src/target/packages/ReportGenerator_${{ env.Version }}.zip

diff --git a/README.md b/README.md
@@ -43,11 +43,11 @@ Use the online [configuration tool](https://reportgenerator.io/usage) to get sta
 
 |**Package**|**Platforms**|**Installation/Usage**|
 |:----------|:------------|:---------------------|
-|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/ReportGenerator.svg?style=for-the-badge)![Nuget](https://img.shields.io/nuget/dt/ReportGenerator.svg?style=for-the-badge)](https://www.nuget.org/packages/ReportGenerator)|.NET Core >=6.0<br/>.NET Framework 4.7|Use this package if your project is based on *.NET Framework* or *.NET Core* and you want to use *ReportGenerator* via the command line or a build script.<br/><br/>**Usage**<br/>```dotnet $(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net8.0\ReportGenerator.dll [options]```<br/>```$(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net8.0\ReportGenerator.exe [options]```<br/><br/>```$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]```|
-|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/dotnet-reportgenerator-globaltool.svg?style=for-the-badge)![Nuget](https://img.shields.io/nuget/dt/dotnet-reportgenerator-globaltool.svg?style=for-the-badge)](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core >=6.0 |Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.<br/><br/>**Installation**<br/>```dotnet tool install -g dotnet-reportgenerator-globaltool```<br/><br/>```dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools```<br/><br/>```dotnet new tool-manifest```<br/>```dotnet tool install dotnet-reportgenerator-globaltool```<br/><br/>**Usage**<br/>```reportgenerator [options]```<br/>```tools\reportgenerator.exe [options]```<br/>```dotnet reportgenerator [options]```|
+|[ReportGenerator](https://www.nuget.org/packages/ReportGenerator)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/ReportGenerator.svg?style=for-the-badge)![Nuget](https://img.shields.io/nuget/dt/ReportGenerator.svg?style=for-the-badge)](https://www.nuget.org/packages/ReportGenerator)|.NET Core >=8.0<br/>.NET Framework 4.7|Use this package if your project is based on *.NET Framework* or *.NET Core* and you want to use *ReportGenerator* via the command line or a build script.<br/><br/>**Usage**<br/>```dotnet $(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net8.0\ReportGenerator.dll [options]```<br/>```$(UserProfile).nuget\packages\reportgenerator\x.y.z\tools\net8.0\ReportGenerator.exe [options]```<br/><br/>```$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options]```|
+|[dotnet-reportgenerator-globaltool](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/dotnet-reportgenerator-globaltool.svg?style=for-the-badge)![Nuget](https://img.shields.io/nuget/dt/dotnet-reportgenerator-globaltool.svg?style=for-the-badge)](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool)|.NET Core >=8.0 |Use this package if your project is based on *.NET Core* and you want to use *ReportGenerator* as a (global) 'DotnetTool'.<br/><br/>**Installation**<br/>```dotnet tool install -g dotnet-reportgenerator-globaltool```<br/><br/>```dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools```<br/><br/>```dotnet new tool-manifest```<br/>```dotnet tool install dotnet-reportgenerator-globaltool```<br/><br/>**Usage**<br/>```reportgenerator [options]```<br/>```tools\reportgenerator.exe [options]```<br/>```dotnet reportgenerator [options]```|
 |[ReportGenerator.Core](https://www.nuget.org/packages/ReportGenerator.Core)<br/><br/>[![Nuget](https://img.shields.io/nuget/v/ReportGenerator.Core.svg?style=for-the-badge)![Nuget](https://img.shields.io/nuget/dt/ReportGenerator.Core.svg?style=for-the-badge)](https://www.nuget.org/packages/ReportGenerator.Core)|.NET Standard 2.0|Use this package if you want to write a custom **plugin** for *ReportGenerator* or if you want to call/execute *ReportGenerator* within your code base.<br/><br/>**Plugin development**<br/>[Custom reports](https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports)<br/>[Custom history storage](https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage)|
-|[Azure DevOps extension](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)<br/><br/>[![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/Palmmedia.reportgenerator.svg?style=for-the-badge)![Visual Studio Marketplace Installs - Azure DevOps Extension](https://img.shields.io/visual-studio-marketplace/azure-devops/installs/total/Palmmedia.reportgenerator.svg?style=for-the-badge)](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)|.NET Core >=6.0| Add the Azure DevOps extension to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#azure-devops-extension)|
-|[GitHub Actions](https://github.com/marketplace/actions/reportgenerator)|.NET Core >=6.0| Add the GitHub Action to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#github-actions)|
+|[Azure DevOps extension](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)<br/><br/>[![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/Palmmedia.reportgenerator.svg?style=for-the-badge)![Visual Studio Marketplace Installs - Azure DevOps Extension](https://img.shields.io/visual-studio-marketplace/azure-devops/installs/total/Palmmedia.reportgenerator.svg?style=for-the-badge)](https://marketplace.visualstudio.com/items?itemName=Palmmedia.reportgenerator)|.NET Core >=8.0| Add the Azure DevOps extension to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#azure-devops-extension)|
+|[GitHub Actions](https://github.com/marketplace/actions/reportgenerator)|.NET Core >=8.0| Add the GitHub Action to your build pipeline.<br />[Learn more](https://github.com/danielpalme/ReportGenerator/wiki/Integration#github-actions)|
 
 ### Usage / Command line parameters
 Use the online [configuration tool](https://reportgenerator.io/usage) to get started quickly.  

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.403",
+    "version": "9.0.100",
     "rollForward": "latestMajor"
   }
 }
diff --git a/src/AzureDevopsTask/ReportGenerator/reportgenerator.ts b/src/AzureDevopsTask/ReportGenerator/reportgenerator.ts
@@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task');
 
 async function executeReportGenerator(): Promise<number> {
     var tool = tl.tool('dotnet')
-    .arg(path.join(__dirname, 'tools/net6.0/ReportGenerator.dll'))
+    .arg(path.join(__dirname, 'tools/net8.0/ReportGenerator.dll'))
     .arg('-reports:' + (tl.getInput('reports') || ''))
     .arg('-targetdir:' + (tl.getInput('targetdir') || ''))
     .arg('-reporttypes:' + (tl.getInput('reporttypes') || ''))

diff --git a/src/AzureDevopsTaskTest/ReportGenerator/reportgenerator.ts b/src/AzureDevopsTaskTest/ReportGenerator/reportgenerator.ts
@@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task');
 
 async function executeReportGenerator(): Promise<number> {
     var tool = tl.tool('dotnet')
-    .arg(path.join(__dirname, 'tools/net6.0/ReportGenerator.dll'))
+    .arg(path.join(__dirname, 'tools/net8.0/ReportGenerator.dll'))
     .arg('-reports:' + (tl.getInput('reports') || ''))
     .arg('-targetdir:' + (tl.getInput('targetdir') || ''))
     .arg('-reporttypes:' + (tl.getInput('reporttypes') || ''))

diff --git a/src/Deployment/chocolatey/reportgenerator.portable.nuspec b/src/Deployment/chocolatey/reportgenerator.portable.nuspec
@@ -24,15 +24,12 @@
     <file src="..\..\Readme.txt" target="Readme.txt" />
     <file src="VERIFICATION.txt" target="tools\VERIFICATION.txt" />
 
-    <!-- Net6.0 ('tools\net6.0' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net6.0\publish\**\*.*" target="tools\net6.0" />
-
-    <!-- Net7.0 ('tools\net7.0' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net7.0\publish\**\*.*" target="tools\net7.0" />
-
     <!-- Net8.0 ('tools\net8.0' directory) -->
     <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net8.0\publish\**\*.*" target="tools\net8.0" />
 
+    <!-- Net9.0 ('tools\net9.0' directory) -->
+    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net9.0\publish\**\*.*" target="tools\net9.0" />
+
     <!-- .NET 4.7 ('tools\net47' directory) -->
     <file src="..\..\ReportGenerator.Console\bin\Release\*.json" target="tools\net47" />
     <file src="..\..\ReportGenerator.Console\bin\Release\*.dll" target="tools\net47" />

diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec
@@ -56,29 +56,21 @@ https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</desc
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\netstandard2.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\netstandard2.0\" />
 
-	  <!-- Execution .NET 6.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net6.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net6.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.xml" target="lib\net6.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net6.0\" />
-    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net6.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net6.0\" />
-    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net6.0\ReportGenerator.DotnetCorePluginLoader.xml" target="lib\net6.0\" />
-
-	  <!-- Execution .NET 7.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net7.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net7.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.xml" target="lib\net7.0\" />
-    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net7.0\" />
-    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net7.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net7.0\" />
-    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net7.0\ReportGenerator.DotnetCorePluginLoader.xml" target="lib\net7.0\" />
-
 	  <!-- Execution .NET 8.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net8.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net8.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.xml" target="lib\net8.0\" />
     <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net8.0\" />
     <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net8.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net8.0\" />
     <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net8.0\ReportGenerator.DotnetCorePluginLoader.xml" target="lib\net8.0\" />
+
+	  <!-- Execution .NET 9.x (see https://github.com/coverlet-coverage/coverlet/pull/694) -->
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.deps.json" target="lib\net9.0\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.dll" target="lib\net9.0\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\ReportGenerator.Core.xml" target="lib\net9.0\" />
+    <file src="..\..\ReportGenerator.Core\bin\Release\appsettings.json" target="lib\net9.0\" />
+    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net9.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\net9.0\" />
+    <file src="..\..\ReportGenerator.DotnetCorePluginLoader\bin\Release\net9.0\ReportGenerator.DotnetCorePluginLoader.xml" target="lib\net9.0\" />
   </files>
 </package>
 
diff --git a/src/Deployment/nuget/ReportGenerator.nuspec b/src/Deployment/nuget/ReportGenerator.nuspec
@@ -34,15 +34,12 @@ $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator
     <!-- MSBuild *.props file -->
     <file src="ReportGenerator.props" target="build\netstandard2.0" />
 
-    <!-- Net6.0 ('tools\net6.0' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net6.0\publish\**\*.*" target="tools\net6.0" />
-
-    <!-- Net7.0 ('tools\net7.0' directory) -->
-    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net7.0\publish\**\*.*" target="tools\net7.0" />
-
     <!-- Net8.0 ('tools\net8.0' directory) -->
     <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net8.0\publish\**\*.*" target="tools\net8.0" />
 
+    <!-- Net9.0 ('tools\net9.0' directory) -->
+    <file src="..\..\ReportGenerator.Console.NetCore\bin\Release\net9.0\publish\**\*.*" target="tools\net9.0" />
+
     <!-- .NET 4.7 ('tools\net47' directory) -->
     <file src="..\..\ReportGenerator.Console\bin\Release\*.json" target="tools\net47" />
     <file src="..\..\ReportGenerator.Console\bin\Release\*.dll" target="tools\net47" />

diff --git a/src/Deployment/nuget/ReportGenerator.props b/src/Deployment/nuget/ReportGenerator.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <ReportGeneratorAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\..\tools\net6.0\ReportGenerator.MSBuild.dll</ReportGeneratorAssembly>
+    <ReportGeneratorAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\..\tools\net8.0\ReportGenerator.MSBuild.dll</ReportGeneratorAssembly>
     <ReportGeneratorAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\..\tools\net47\ReportGenerator.MSBuild.dll</ReportGeneratorAssembly>
   </PropertyGroup>
   <UsingTask TaskName="ReportGenerator" AssemblyFile="$(ReportGeneratorAssembly)" />

diff --git a/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec b/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec
@@ -42,16 +42,12 @@ dotnet reportgenerator [options]</description>
     <file src="..\..\Readme.txt" target="Readme.txt" />
     <file src="Readme_dotnet-reportgenerator-globaltool.md" target="Readme.md" />
 
-    <!-- Net6.0 ('tools\net6.0' directory) -->
-    <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\net6.0\publish\**\*.*" target="tools\net6.0\any" />
-    <file src="DotnetToolSettings.xml" target="tools\net6.0\any" />
-
-    <!-- Net7.0 ('tools\net7.0' directory) -->
-    <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\net7.0\publish\**\*.*" target="tools\net7.0\any" />
-    <file src="DotnetToolSettings.xml" target="tools\net7.0\any" />
-
     <!-- Net8.0 ('tools\net8.0' directory) -->
     <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\net8.0\publish\**\*.*" target="tools\net8.0\any" />
     <file src="DotnetToolSettings.xml" target="tools\net8.0\any" />
+
+    <!-- Net9.0 ('tools\net9.0' directory) -->
+    <file src="..\..\ReportGenerator.DotnetGlobalTool\bin\Release\net9.0\publish\**\*.*" target="tools\net9.0\any" />
+    <file src="DotnetToolSettings.xml" target="tools\net9.0\any" />
   </files>
 </package>
diff --git a/src/Readme.txt b/src/Readme.txt
@@ -69,6 +69,7 @@ CHANGELOG
 
 5.3.12.0
 
+    * New: Added support for .NET 9. Dropped support for .NET 6 and .NET 7
     * Fix: #699 Rounding crap score to full number
     * Fix: #700 Fixed handling of .netconfig files (sourceDirectories, reportTypes, plugins, assemblyFilters, etc.)
 

diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
     <AssemblyName>ReportGenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ CHANGELOG @@
 .3.12.0
+        * New: Added support for .NET 9. Dropped support for .NET 6 and .NET 7
         * Fix: #699 Rounding crap score to full number
         * Fix: #700 Fixed handling of .netconfig files (sourceDirectories, reportTypes, plugins, assemblyFilters, etc.)
@@ Expand Down @@