From f5ff6193e8388c73982fe15fbe41f20e907eeba5 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Tue, 12 Nov 2024 22:38:15 +0200
Subject: [PATCH] Use .NET 9

---
 .github/workflows/main.yml                          | 2 +-
 CliFx.Analyzers.Tests/CliFx.Analyzers.Tests.csproj  | 2 +-
 CliFx.Benchmarks/CliFx.Benchmarks.csproj            | 2 +-
 CliFx.Demo/CliFx.Demo.csproj                        | 2 +-
 CliFx.Tests.Dummy/CliFx.Tests.Dummy.csproj          | 2 +-
 CliFx.Tests/CliFx.Tests.csproj                      | 2 +-
 CliFx.Tests/Utils/Extensions/AssertionExtensions.cs | 5 +----
 CliFx/Utils/Disposable.cs                           | 5 +----
 8 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6843bd6..dd8a748 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
     with:
       deploy: ${{ inputs.deploy || github.ref_type == 'tag' }}
       package-version: ${{ inputs.package-version || (github.ref_type == 'tag' && github.ref_name) || format('0.0.0-ci-{0}', github.sha) }}
-      dotnet-version: 8.0.x
+      dotnet-version: 9.0.x
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
diff --git a/CliFx.Analyzers.Tests/CliFx.Analyzers.Tests.csproj b/CliFx.Analyzers.Tests/CliFx.Analyzers.Tests.csproj
index e66783b..95a44fa 100644
--- a/CliFx.Analyzers.Tests/CliFx.Analyzers.Tests.csproj
+++ b/CliFx.Analyzers.Tests/CliFx.Analyzers.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/CliFx.Benchmarks/CliFx.Benchmarks.csproj b/CliFx.Benchmarks/CliFx.Benchmarks.csproj
index cd9c097..eeb6a8e 100644
--- a/CliFx.Benchmarks/CliFx.Benchmarks.csproj
+++ b/CliFx.Benchmarks/CliFx.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/CliFx.Demo/CliFx.Demo.csproj b/CliFx.Demo/CliFx.Demo.csproj
index 32c0353..3bed090 100644
--- a/CliFx.Demo/CliFx.Demo.csproj
+++ b/CliFx.Demo/CliFx.Demo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ApplicationIcon>../favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
diff --git a/CliFx.Tests.Dummy/CliFx.Tests.Dummy.csproj b/CliFx.Tests.Dummy/CliFx.Tests.Dummy.csproj
index 849e0d0..1cdb598 100644
--- a/CliFx.Tests.Dummy/CliFx.Tests.Dummy.csproj
+++ b/CliFx.Tests.Dummy/CliFx.Tests.Dummy.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ApplicationIcon>../favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
diff --git a/CliFx.Tests/CliFx.Tests.csproj b/CliFx.Tests/CliFx.Tests.csproj
index ffd59a4..11b0c3b 100644
--- a/CliFx.Tests/CliFx.Tests.csproj
+++ b/CliFx.Tests/CliFx.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/CliFx.Tests/Utils/Extensions/AssertionExtensions.cs b/CliFx.Tests/Utils/Extensions/AssertionExtensions.cs
index f4f03a9..8ef3fd4 100644
--- a/CliFx.Tests/Utils/Extensions/AssertionExtensions.cs
+++ b/CliFx.Tests/Utils/Extensions/AssertionExtensions.cs
@@ -10,16 +10,13 @@ internal static class AssertionExtensions
 {
     public static void ConsistOfLines(
         this StringAssertions assertions,
-        IEnumerable<string> lines
+        params IEnumerable<string> lines
     ) =>
         assertions
             .Subject.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)
             .Should()
             .Equal(lines);
 
-    public static void ConsistOfLines(this StringAssertions assertions, params string[] lines) =>
-        assertions.ConsistOfLines((IEnumerable<string>)lines);
-
     public static AndConstraint<StringAssertions> ContainAllInOrder(
         this StringAssertions assertions,
         IEnumerable<string> values
diff --git a/CliFx/Utils/Disposable.cs b/CliFx/Utils/Disposable.cs
index 1050540..02484b4 100644
--- a/CliFx/Utils/Disposable.cs
+++ b/CliFx/Utils/Disposable.cs
@@ -12,13 +12,10 @@ internal partial class Disposable
 {
     public static IDisposable Create(Action dispose) => new Disposable(dispose);
 
-    public static IDisposable Merge(IEnumerable<IDisposable> disposables) =>
+    public static IDisposable Merge(params IEnumerable<IDisposable> disposables) =>
         Create(() =>
         {
             foreach (var disposable in disposables)
                 disposable.Dispose();
         });
-
-    public static IDisposable Merge(params IDisposable[] disposables) =>
-        Merge((IEnumerable<IDisposable>)disposables);
 }