From 375a708c43bf4b0f1e091f04352ff98955cbde5c Mon Sep 17 00:00:00 2001
From: Patrik Svensson <patriksvensson@users.noreply.github.com>
Date: Wed, 13 Nov 2024 14:54:01 +0100
Subject: [PATCH] Add `net9.0` support, remove legacy TFM:s (#1682)

* Update .NET SDK to 9.0.100
* Remove net6.0
* Remove net7.0
* Update dependencies
* Install correct .NET SDK:s in GitHub Actions
---
 .github/workflows/ci.yaml                     |  3 +-
 .github/workflows/publish.yaml                |  3 +-
 dotnet-tools.json                             |  8 +----
 global.json                                   |  2 +-
 src/Directory.Packages.props                  | 34 ++++++++-----------
 .../Spectre.Console.ImageSharp.csproj         |  2 +-
 .../Spectre.Console.Json.csproj               |  2 +-
 .../Spectre.Console.Cli.csproj                |  2 +-
 .../Spectre.Console.Testing.csproj            |  2 +-
 src/Spectre.Console/Spectre.Console.csproj    |  2 +-
 .../Spectre.Console.Cli.Tests.csproj          |  2 +-
 .../Spectre.Console.Tests.csproj              |  2 +-
 12 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index dff6ba2a..c30d08a6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -26,9 +26,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
 
       - name: Build
         shell: bash
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 370d250f..4b38c10d 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -32,9 +32,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
 
       - name: Publish
         shell: bash
diff --git a/dotnet-tools.json b/dotnet-tools.json
index a7f9d036..c5f9c90c 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -3,17 +3,11 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "4.0.0",
+      "version": "5.0.0",
       "commands": [
         "dotnet-cake"
       ]
     },
-    "dotnet-example": {
-      "version": "3.1.0",
-      "commands": [
-        "dotnet-example"
-      ]
-    },
     "verify.tool": {
       "version": "0.6.0",
       "commands": [
diff --git a/global.json b/global.json
index 7c3a1a19..fb38f00f 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/global",
   "sdk": {
-    "version": "8.0.401",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 0c9ab6ef..94dd82a0 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -2,29 +2,25 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-
   <ItemGroup Label="Dependencies">
-    <PackageVersion Include="MinVer" PrivateAssets="All" Version="6.0.0"/>
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="8.0.0"/>
-    <PackageVersion Include="Wcwidth.Sources" Version="2.0.0"/>
-    <PackageVersion Include="IsExternalInit" Version="1.0.3"/>
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-    <PackageVersion Include="Shouldly" Version="4.2.1"/>
-    <PackageVersion Include="Spectre.Verify.Extensions" Version="22.3.2-preview.0.1"/>
-    <PackageVersion Include="Verify.Xunit" Version="26.4.5"/>
-    <PackageVersion Include="xunit" Version="2.9.0"/>
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="MinVer" PrivateAssets="All" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="8.0.0" />
+    <PackageVersion Include="Wcwidth.Sources" Version="2.0.0" />
+    <PackageVersion Include="IsExternalInit" Version="1.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Shouldly" Version="4.2.1" />
+    <PackageVersion Include="Spectre.Verify.Extensions" Version="22.3.2-preview.0.1" />
+    <PackageVersion Include="Verify.Xunit" Version="28.2.1" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="System.Memory" Version="4.6.0" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
-
-    <PackageVersion Include="Nullable" Version="1.3.1"/>
+    <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" />
   </ItemGroup>
-
   <ItemGroup Label="Static Analysis">
-    <PackageVersion Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.2.0-beta.556"/>
-    <PackageVersion Include="Roslynator.Analyzers" PrivateAssets="All" Version="4.12.5"/>
+    <PackageVersion Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.2.0-beta.556" />
+    <PackageVersion Include="Roslynator.Analyzers" PrivateAssets="All" Version="4.12.9" />
   </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj b/src/Extensions/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj
index 02412277..61c4de29 100644
--- a/src/Extensions/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj
+++ b/src/Extensions/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <Description>A library that extends Spectre.Console with ImageSharp superpowers.</Description>
   </PropertyGroup>
diff --git a/src/Extensions/Spectre.Console.Json/Spectre.Console.Json.csproj b/src/Extensions/Spectre.Console.Json/Spectre.Console.Json.csproj
index 1c75fef8..ef09838a 100644
--- a/src/Extensions/Spectre.Console.Json/Spectre.Console.Json.csproj
+++ b/src/Extensions/Spectre.Console.Json/Spectre.Console.Json.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks> 
+    <TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks> 
     <ImplicitUsings>true</ImplicitUsings>
     <IsPackable>true</IsPackable>
     <Description>A library that extends Spectre.Console with JSON superpowers.</Description>
diff --git a/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj b/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj
index 4eab3855..482887f4 100644
--- a/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj
+++ b/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj b/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj
index 4b65da97..182a63d0 100644
--- a/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj
+++ b/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
     <IsTestProject>false</IsTestProject>
     <IsPackable>true</IsPackable>
     <Description>Contains testing utilities for Spectre.Console.</Description>
diff --git a/src/Spectre.Console/Spectre.Console.csproj b/src/Spectre.Console/Spectre.Console.csproj
index 49a55049..9480036d 100644
--- a/src/Spectre.Console/Spectre.Console.csproj
+++ b/src/Spectre.Console/Spectre.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <DefineConstants>$(DefineConstants)TRACE;WCWIDTH_VISIBILITY_INTERNAL</DefineConstants>
   </PropertyGroup>
diff --git a/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj b/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj
index 10e189c7..1d95708b 100644
--- a/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj
+++ b/src/Tests/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj b/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj
index 97100e1f..352f29d9 100644
--- a/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj
+++ b/src/Tests/Spectre.Console.Tests/Spectre.Console.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>