From 489c29319f3ff73491c02a446f7d0ec34037bc29 Mon Sep 17 00:00:00 2001
From: Adam Ralph <adam@adamralph.com>
Date: Sat, 23 Dec 2023 17:27:17 +0000
Subject: [PATCH] target .NET 8

---
 .devcontainer/Dockerfile                      |  2 +-
 .github/workflows/ci.yml                      | 52 ++++++++-----------
 .github/workflows/release.yml                 |  2 +-
 .vscode/launch.json                           |  2 +-
 Directory.Build.props                         |  2 +
 MinVer.Lib/Commit.cs                          |  8 ++-
 MinVer.Lib/Git.cs                             | 10 ++--
 MinVer.Lib/MinVer.Lib.csproj                  |  3 +-
 MinVer.Lib/NoGitException.cs                  |  5 +-
 MinVer.Lib/Versioner.cs                       | 35 +++++--------
 MinVer/Logger.cs                              |  6 +--
 MinVer/MinVer.csproj                          |  3 +-
 MinVer/build/MinVer.targets                   |  1 +
 MinVerTests.Infra/MinVerCli.cs                |  3 ++
 MinVerTests.Infra/MinVerTests.Infra.csproj    |  2 +-
 MinVerTests.Infra/Sdk.cs                      | 47 +++++++++++------
 MinVerTests.Infra/StringExtensions.cs         | 14 +++++
 MinVerTests.Lib/Infra/TestLogger.cs           |  6 +--
 MinVerTests.Lib/LogMessages.cs                |  4 +-
 MinVerTests.Lib/MinVerTests.Lib.csproj        |  2 +-
 MinVerTests.Lib/Versions.cs                   |  3 +-
 MinVerTests.Packages/AnnotatedTag.cs          |  2 +-
 MinVerTests.Packages/BuildMetadata.cs         |  2 +-
 .../CommitAfterPreReleaseTag.cs               |  2 +-
 MinVerTests.Packages/CommitAfterRtmTag.cs     |  2 +-
 .../CommitAfterTagWithBuildMetadata.cs        |  2 +-
 MinVerTests.Packages/CustomAutoIncrement.cs   |  2 +-
 .../CustomDefaultPreReleaseIdentifiers.cs     |  6 +--
 MinVerTests.Packages/EmptyRepo.cs             |  2 +-
 MinVerTests.Packages/FirstCommit.cs           |  2 +-
 .../MinVerTests.Packages.csproj               |  2 +-
 .../MinimumMajorMinorAfterTag.cs              |  2 +-
 .../MinimumMajorMinorOnTag.cs                 |  2 +-
 MinVerTests.Packages/MultipleProjects.cs      |  4 +-
 MinVerTests.Packages/NoRepo.cs                |  2 +-
 MinVerTests.Packages/NonVersionTag.cs         |  2 +-
 MinVerTests.Packages/OptionMasking.cs         | 10 ++--
 MinVerTests.Packages/PreReleaseTag.cs         |  2 +-
 MinVerTests.Packages/SourceLink.cs            | 14 +++--
 MinVerTests.Packages/TagWithBuildMetadata.cs  |  2 +-
 MinVerTests.Packages/TagWithPrefix.cs         |  2 +-
 .../TwoCommitsAfterPreReleaseTag.cs           |  2 +-
 MinVerTests.Packages/TwoCommitsAfterRtmTag.cs |  2 +-
 MinVerTests.Packages/VersionOverride.cs       |  2 +-
 global.json                                   |  2 +-
 minver-cli/Logger.cs                          |  6 +--
 minver-cli/minver-cli.csproj                  |  3 +-
 targets/Program.cs                            |  9 ++--
 targets/Targets.csproj                        |  2 +-
 49 files changed, 162 insertions(+), 144 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 1f694f71..8ce77a5b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,3 +1,3 @@
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-7.0
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-8.0
 
 RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install lts/* && npm install -g cspell 2>&1"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70449dbb..cd7821ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,29 +16,23 @@ jobs:
           - job:
               os: macos-11
             tests:
-              framework: net6.0
-              sdk: "6.0.417"
-              sdk-major-minor: "6.0"
+              framework: net8.0
+              sdk: "8.0.100"
+              sdk-major-minor: "8.0"
           # current macOS, latest LTS and latest
           - job:
               os: macos-12
             tests:
-              framework: net6.0
-              sdk: "6.0.417"
-              sdk-major-minor: "6.0"
-          - job:
-              os: macos-12
-            tests:
-              framework: net7.0
-              sdk: "7.0.404"
-              sdk-major-minor: "7.0"
+              framework: net8.0
+              sdk: "8.0.100"
+              sdk-major-minor: "8.0"
           # old Linux, latest LTS
           - job:
               os: ubuntu-20.04
             tests:
-              framework: net6.0
-              sdk: "6.0.417"
-              sdk-major-minor: "6.0"
+              framework: net8.0
+              sdk: "8.0.100"
+              sdk-major-minor: "8.0"
           # current Linux, all
           - job:
               os: ubuntu-22.04
@@ -53,26 +47,26 @@ jobs:
               framework: net7.0
               sdk: "7.0.404"
               sdk-major-minor: "7.0"
-          # old Windows, latest LTS
           - job:
-              os: windows-2019
+              os: ubuntu-22.04
             tests:
-              framework: net6.0
-              sdk: "6.0.417"
-              sdk-major-minor: "6.0"
-          # current Windows, latest LTS and latest
+              framework: net8.0
+              sdk: "8.0.100"
+              sdk-major-minor: "8.0"
+          # old Windows, latest LTS
           - job:
-              os: windows-2022
+              os: windows-2019
             tests:
-              framework: net6.0
-              sdk: "6.0.417"
-              sdk-major-minor: "6.0"
+              framework: net8.0
+              sdk: "8.0.100"
+              sdk-major-minor: "8.0"
+            # current Windows, latest LTS and latest
           - job:
               os: windows-2022
             tests:
-              framework: net7.0
-              sdk: "7.0.404"
-              sdk-major-minor: "7.0"
+              framework: net8.0
+              sdk: "8.0.100"
+              sdk-major-minor: "8.0"
     name: ${{ matrix.job.os }}-sdk-${{ matrix.tests.sdk-major-minor }}
     runs-on: ${{ matrix.job.os }}
     steps:
@@ -80,7 +74,7 @@ jobs:
         with:
           dotnet-version: |
             ${{ matrix.tests.sdk }}
-            7.0.404
+            8.0.100
       - run: dotnet --info
       - run: git --version
       - uses: actions/checkout@v4.1.1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 380d78c3..c9f4d638 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-dotnet@v4.0.0
         with:
-          dotnet-version: 7.0.404
+          dotnet-version: 8.0.100
       - uses: actions/checkout@v4.1.1
       - env:
           MINVER_VERSION: ${{ vars.MINVER_VERSION }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index d769f426..49e37fa8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,7 @@
       "name": ".NET Launch (console)",
       "type": "coreclr",
       "request": "launch",
-      "program": "${workspaceFolder}/targets/bin/Debug/net7.0/Targets.dll",
+      "program": "${workspaceFolder}/targets/bin/Debug/net8.0/Targets.dll",
       "args": [
         "default"
       ],
diff --git a/Directory.Build.props b/Directory.Build.props
index 083bdfb0..5d9ccc4e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,6 +6,8 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!-- workaround for https://github.com/dotnet/roslyn/issues/41640 -->
+    <NoWarn>EnableGenerateDocumentationFile</NoWarn>
     <Nullable>enable</Nullable>
     <!-- MinVer doesn't use MinVer for versioning because
 the environment variables for the build and for the package tests
diff --git a/MinVer.Lib/Commit.cs b/MinVer.Lib/Commit.cs
index 5d998d85..08b150f2 100644
--- a/MinVer.Lib/Commit.cs
+++ b/MinVer.Lib/Commit.cs
@@ -3,15 +3,13 @@
 
 namespace MinVer.Lib;
 
-internal sealed class Commit
+internal sealed class Commit(string sha)
 {
-    public Commit(string sha) => this.Sha = sha;
-
-    public string Sha { get; }
+    public string Sha { get; } = sha;
 
     public string ShortSha => this.Sha[..Math.Min(7, this.Sha.Length)];
 
-    public List<Commit> Parents { get; } = new();
+    public List<Commit> Parents { get; } = [];
 
     public override string ToString() => this.ShortSha;
 }
diff --git a/MinVer.Lib/Git.cs b/MinVer.Lib/Git.cs
index 8ed27e7d..e317a62e 100644
--- a/MinVer.Lib/Git.cs
+++ b/MinVer.Lib/Git.cs
@@ -7,6 +7,8 @@ namespace MinVer.Lib;
 
 internal static class Git
 {
+    private static readonly char[] newLineChars = ['\r', '\n',];
+
     public static bool IsWorkingDirectory(string directory, ILogger log) => GitCommand.TryRun("status --short", directory, log, out _);
 
     public static bool TryGetHead(string directory, [NotNullWhen(returnValue: true)] out Commit? head, ILogger log)
@@ -18,7 +20,7 @@ public static bool TryGetHead(string directory, [NotNullWhen(returnValue: true)]
             return false;
         }
 
-        var lines = output.Split(new[] { '\r', '\n', }, StringSplitOptions.RemoveEmptyEntries);
+        var lines = output.Split(newLineChars, StringSplitOptions.RemoveEmptyEntries);
 
         if (lines.Length == 0)
         {
@@ -28,7 +30,7 @@ public static bool TryGetHead(string directory, [NotNullWhen(returnValue: true)]
         var commits = new Dictionary<string, Commit>();
 
         foreach (var shas in lines
-            .Select(line => line.Split(new[] { ' ', }, StringSplitOptions.RemoveEmptyEntries)))
+            .Select(line => line.Split(" ", StringSplitOptions.RemoveEmptyEntries)))
         {
             commits.GetOrAdd(shas[0], () => new Commit(shas[0]))
                 .Parents.AddRange(shas.Skip(1).Select(parentSha => commits.GetOrAdd(parentSha, () => new Commit(parentSha))));
@@ -42,8 +44,8 @@ public static bool TryGetHead(string directory, [NotNullWhen(returnValue: true)]
     public static IEnumerable<(string Name, string Sha)> GetTags(string directory, ILogger log) =>
         GitCommand.TryRun("show-ref --tags --dereference", directory, log, out var output)
             ? output
-                .Split(new[] { '\r', '\n', }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Split(new[] { ' ', }, 2))
+                .Split(newLineChars, StringSplitOptions.RemoveEmptyEntries)
+                .Select(line => line.Split(" ", 2))
                 .Select(tokens => (tokens[1][10..].RemoveFromEnd("^{}"), tokens[0]))
             : Enumerable.Empty<(string, string)>();
 
diff --git a/MinVer.Lib/MinVer.Lib.csproj b/MinVer.Lib/MinVer.Lib.csproj
index 75122532..cffe0038 100644
--- a/MinVer.Lib/MinVer.Lib.csproj
+++ b/MinVer.Lib/MinVer.Lib.csproj
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="NuGet.Versioning" Version="6.8.0" />
   </ItemGroup>
 
diff --git a/MinVer.Lib/NoGitException.cs b/MinVer.Lib/NoGitException.cs
index 4b28696f..2d7b9aae 100644
--- a/MinVer.Lib/NoGitException.cs
+++ b/MinVer.Lib/NoGitException.cs
@@ -3,10 +3,7 @@
 namespace MinVer.Lib;
 
 #pragma warning disable CA1032 // Implement standard exception constructors
-public class NoGitException : Exception
+public class NoGitException(string message, Exception innerException) : Exception(message, innerException)
 #pragma warning restore CA1032
 {
-    public NoGitException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
 }
diff --git a/MinVer.Lib/Versioner.cs b/MinVer.Lib/Versioner.cs
index b9f48c0e..f3e968bb 100644
--- a/MinVer.Lib/Versioner.cs
+++ b/MinVer.Lib/Versioner.cs
@@ -93,10 +93,12 @@ private static List<Candidate> GetCandidates(Commit head, IEnumerable<(string Na
             }
         }
 
-        tagsAndVersions = tagsAndVersions
-            .OrderBy(tagAndVersion => tagAndVersion.Version)
-            .ThenBy(tagsAndVersion => tagsAndVersion.Name)
-            .ToList();
+        tagsAndVersions =
+        [
+            .. tagsAndVersions
+                .OrderBy(tagAndVersion => tagAndVersion.Version)
+                .ThenBy(tagsAndVersion => tagsAndVersion.Name)
+        ];
 
         var itemsToCheck = new Stack<(Commit Commit, int Height, Commit? Child)>();
         itemsToCheck.Push((head, 0, null));
@@ -117,7 +119,7 @@ private static List<Candidate> GetCandidates(Commit head, IEnumerable<(string Na
 
             var commitTagsAndVersions = tagsAndVersions.Where(tagAndVersion => tagAndVersion.Sha == item.Commit.Sha).ToList();
 
-            if (commitTagsAndVersions.Any())
+            if (commitTagsAndVersions.Count != 0)
             {
                 foreach (var (name, _, version) in commitTagsAndVersions)
                 {
@@ -131,7 +133,7 @@ private static List<Candidate> GetCandidates(Commit head, IEnumerable<(string Na
 
             _ = log.IsTraceEnabled && log.Trace($"Found no version tags on commit {item.Commit}.");
 
-            if (!item.Commit.Parents.Any())
+            if (item.Commit.Parents.Count == 0)
             {
                 candidates.Add(new Candidate(item.Commit, item.Height, "", new Version(defaultPreReleaseIdentifiers), candidates.Count));
                 _ = log.IsTraceEnabled && log.Trace($"Found root commit {candidates.Last()}.");
@@ -157,26 +159,17 @@ private static List<Candidate> GetCandidates(Commit head, IEnumerable<(string Na
         return candidates;
     }
 
-    private sealed class Candidate
+    private sealed class Candidate(Commit commit, int height, string tag, Version version, int index)
     {
-        public Candidate(Commit commit, int height, string tag, Version version, int index)
-        {
-            this.Commit = commit;
-            this.Height = height;
-            this.Tag = tag;
-            this.Version = version;
-            this.Index = index;
-        }
-
-        public Commit Commit { get; }
+        public Commit Commit { get; } = commit;
 
-        public int Height { get; }
+        public int Height { get; } = height;
 
-        public string Tag { get; }
+        public string Tag { get; } = tag;
 
-        public Version Version { get; }
+        public Version Version { get; } = version;
 
-        public int Index { get; }
+        public int Index { get; } = index;
 
         public override string ToString() => this.ToString(0, 0, 0);
 
diff --git a/MinVer/Logger.cs b/MinVer/Logger.cs
index e646431e..8fcaf762 100644
--- a/MinVer/Logger.cs
+++ b/MinVer/Logger.cs
@@ -3,11 +3,9 @@
 
 namespace MinVer;
 
-internal sealed class Logger : ILogger
+internal sealed class Logger(Verbosity verbosity) : ILogger
 {
-    private readonly Verbosity verbosity;
-
-    public Logger(Verbosity verbosity) => this.verbosity = verbosity;
+    private readonly Verbosity verbosity = verbosity;
 
     public bool IsTraceEnabled => this.verbosity >= Verbosity.Diagnostic;
 
diff --git a/MinVer/MinVer.csproj b/MinVer/MinVer.csproj
index 2e46910c..fe8f9fd1 100644
--- a/MinVer/MinVer.csproj
+++ b/MinVer/MinVer.csproj
@@ -18,7 +18,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
@@ -29,7 +29,6 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" PrivateAssets="All" Publish="true" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/MinVer/build/MinVer.targets b/MinVer/build/MinVer.targets
index 6929643c..cdc8b87b 100644
--- a/MinVer/build/MinVer.targets
+++ b/MinVer/build/MinVer.targets
@@ -11,6 +11,7 @@
     <MinVerDetailed Condition="'$(MinVerVerbosity)' == 'detailed' Or '$(MinVerVerbosity)' == 'd' Or '$(MinVerVerbosity)' == 'diagnostic' Or '$(MinVerVerbosity)' == 'diag'">high</MinVerDetailed>
     <MinVerTargetFramework>net6.0</MinVerTargetFramework>
     <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.4'">net7.0</MinVerTargetFramework>
+    <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.8'">net8.0</MinVerTargetFramework>
     <NoWarn>$(NoWarn);NU5105</NoWarn>
   </PropertyGroup>
 
diff --git a/MinVerTests.Infra/MinVerCli.cs b/MinVerTests.Infra/MinVerCli.cs
index c161b1be..e1048423 100644
--- a/MinVerTests.Infra/MinVerCli.cs
+++ b/MinVerTests.Infra/MinVerCli.cs
@@ -20,6 +20,9 @@ public static string GetPath(string configuration) =>
 #endif
 #if NET7_0
             Solution.GetFullPath($"minver-cli/bin/{configuration}/net7.0/minver-cli.dll");
+#endif
+#if NET8_0
+            Solution.GetFullPath($"minver-cli/bin/{configuration}/net8.0/minver-cli.dll");
 #endif
     }
 }
diff --git a/MinVerTests.Infra/MinVerTests.Infra.csproj b/MinVerTests.Infra/MinVerTests.Infra.csproj
index 4fa26060..ba26571d 100644
--- a/MinVerTests.Infra/MinVerTests.Infra.csproj
+++ b/MinVerTests.Infra/MinVerTests.Infra.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MinVerTests.Infra/Sdk.cs b/MinVerTests.Infra/Sdk.cs
index 8250cb35..35ecba1a 100644
--- a/MinVerTests.Infra/Sdk.cs
+++ b/MinVerTests.Infra/Sdk.cs
@@ -52,16 +52,16 @@ public static async Task CreateSolution(string path, string[] projectNames, stri
             }
         }
 
-        public static async Task CreateProject(string path, string configuration = Configuration.Current, bool multiTarget = false)
+        public static async Task CreateProject(string path, string configuration = Configuration.Current, bool multiTarget = false, bool enableSourceLink = false)
         {
             FileSystem.EnsureEmptyDirectory(path);
 
             CreateGlobalJsonIfRequired(path);
 
-            await CreateProject(path, configuration, "test", multiTarget).ConfigureAwait(false);
+            await CreateProject(path, configuration, "test", multiTarget, enableSourceLink).ConfigureAwait(false);
         }
 
-        private static async Task CreateProject(string path, string configuration, string name, bool multiTarget = false)
+        private static async Task CreateProject(string path, string configuration, string name, bool multiTarget = false, bool enableSourceLink = false)
         {
             _ = await DotNet($"new classlib --name {name} --output {path}{(multiTarget ? " --langVersion 8.0" : "")}", path).ConfigureAwait(false);
 
@@ -70,21 +70,38 @@ private static async Task CreateProject(string path, string configuration, strin
 
             _ = await DotNet($"add package MinVer --source {source} --version {minVerPackageVersion} --package-directory packages", path).ConfigureAwait(false);
 
-            if (multiTarget)
-            {
-                var project = Path.Combine(path, $"{name}.csproj");
-                var lines = await File.ReadAllLinesAsync(project).ConfigureAwait(false);
+            var project = Path.Combine(path, $"{name}.csproj");
+            var lines = await File.ReadAllLinesAsync(project).ConfigureAwait(false);
+            var editedLines = new List<string>();
 
-                var editedLines = lines
-                    .Select(line => line.Contains("<TargetFramework>", StringComparison.OrdinalIgnoreCase)
-                        ? line
+            foreach (var line in lines)
+            {
+                if (line.Contains("<TargetFramework>", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (multiTarget)
+                    {
+                        editedLines.Add(line
                             .Replace("TargetFramework", "TargetFrameworks", StringComparison.OrdinalIgnoreCase)
-                            .Replace("</TargetFrameworks>", ";netstandard2.1</TargetFrameworks>", StringComparison.Ordinal)
-                        : line);
-
-                await File.WriteAllLinesAsync(project, editedLines).ConfigureAwait(false);
+                            .Replace("</TargetFrameworks>", ";netstandard2.1</TargetFrameworks>", StringComparison.Ordinal));
+                    }
+                    else
+                    {
+                        editedLines.Add(line);
+                    }
+
+                    if (!enableSourceLink)
+                    {
+                        editedLines.Add("<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>");
+                    }
+                }
+                else
+                {
+                    editedLines.Add(line);
+                }
             }
 
+            await File.WriteAllLinesAsync(project, editedLines).ConfigureAwait(false);
+
             _ = await DotNet($"restore --source {source} --packages packages", path).ConfigureAwait(false);
         }
 
@@ -141,7 +158,7 @@ private static void CreateGlobalJsonIfRequired(string path)
 
             // -maxCpuCount:1 is required to prevent massive execution times in GitHub Actions
             return await DotNet(
-                $"pack -maxCpuCount:1 --no-restore{(!Version.StartsWith("2.", StringComparison.Ordinal) ? " --nologo" : "")}",
+                $"pack --configuration Debug -maxCpuCount:1 --no-restore{(!Version.StartsWith("2.", StringComparison.Ordinal) ? " --nologo" : "")}",
                 path,
                 environmentVariables).ConfigureAwait(false);
         }
diff --git a/MinVerTests.Infra/StringExtensions.cs b/MinVerTests.Infra/StringExtensions.cs
index 43d39669..e918c150 100644
--- a/MinVerTests.Infra/StringExtensions.cs
+++ b/MinVerTests.Infra/StringExtensions.cs
@@ -1,9 +1,23 @@
+using System;
 using System.Linq;
 
 namespace MinVerTests.Infra
 {
     public static class StringExtensions
     {
+#if NET8_0_OR_GREATER
+        private static readonly char[] newLineChars = ['\r', '\n',];
+#else
+        private static readonly char[] newLineChars = { '\r', '\n', };
+#endif
+
+        public static string[] ToNonEmptyLines(this string text) =>
+#if NET8_0_OR_GREATER
+            text?.Split(newLineChars, StringSplitOptions.RemoveEmptyEntries) ?? [];
+#else
+            text?.Split(newLineChars, StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+#endif
+
         public static string ToAltCase(this string value) =>
 #pragma warning disable CA1308 // Normalize strings to uppercase
 #if NET6_0_OR_GREATER
diff --git a/MinVerTests.Lib/Infra/TestLogger.cs b/MinVerTests.Lib/Infra/TestLogger.cs
index e66d8395..3dd089e7 100644
--- a/MinVerTests.Lib/Infra/TestLogger.cs
+++ b/MinVerTests.Lib/Infra/TestLogger.cs
@@ -7,10 +7,10 @@ namespace MinVerTests.Lib.Infra
 {
     internal sealed class TestLogger : ILogger
     {
-#if NET6_0_OR_GREATER
-        private readonly List<LogMessage> messages = new();
+#if NET8_0_OR_GREATER
+        private readonly List<LogMessage> messages = [];
 #else
-        private readonly List<LogMessage> messages = new List<LogMessage>();
+        private readonly List<LogMessage> messages = new();
 #endif
 
         public bool IsTraceEnabled => true;
diff --git a/MinVerTests.Lib/LogMessages.cs b/MinVerTests.Lib/LogMessages.cs
index 73f66248..99d88d9c 100644
--- a/MinVerTests.Lib/LogMessages.cs
+++ b/MinVerTests.Lib/LogMessages.cs
@@ -45,7 +45,7 @@ git checkout main
             await EnsureEmptyRepository(path);
 
             foreach (var item in historicalCommands
-                .Split(new[] { '\r', '\n', }, StringSplitOptions.RemoveEmptyEntries)
+                .ToNonEmptyLines()
                 .Select((command, index) => new { Command = command, Index = $"{index}", }))
             {
                 if (item.Command.StartsWith("git commit", StringComparison.Ordinal))
@@ -75,7 +75,7 @@ git checkout main
 
             var shas = (await ReadAsync("git", "log --pretty=format:\"%H\"", path))
                 .StandardOutput
-                .Split(new[] { '\r', '\n', }, StringSplitOptions.RemoveEmptyEntries)
+                .ToNonEmptyLines()
                 .Reverse()
                 .ToList();
 
diff --git a/MinVerTests.Lib/MinVerTests.Lib.csproj b/MinVerTests.Lib/MinVerTests.Lib.csproj
index 47dc24d0..e6c20e0e 100644
--- a/MinVerTests.Lib/MinVerTests.Lib.csproj
+++ b/MinVerTests.Lib/MinVerTests.Lib.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RollForward>major</RollForward>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MinVerTests.Lib/Versions.cs b/MinVerTests.Lib/Versions.cs
index 80ed8782..23e2b6b9 100644
--- a/MinVerTests.Lib/Versions.cs
+++ b/MinVerTests.Lib/Versions.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -70,7 +69,7 @@ git tag 1.1.0 -a -m '.'
 
             await EnsureEmptyRepositoryAndCommit(path);
 
-            foreach (var command in historicalCommands.Split(new[] { '\r', '\n', }, StringSplitOptions.RemoveEmptyEntries))
+            foreach (var command in historicalCommands.ToNonEmptyLines())
             {
                 var nameAndArgs = command.Split(" ", 2);
                 _ = await ReadAsync(nameAndArgs[0], nameAndArgs[1], path);
diff --git a/MinVerTests.Packages/AnnotatedTag.cs b/MinVerTests.Packages/AnnotatedTag.cs
index 850d6929..3fa25e59 100644
--- a/MinVerTests.Packages/AnnotatedTag.cs
+++ b/MinVerTests.Packages/AnnotatedTag.cs
@@ -18,7 +18,7 @@ public static async Task HasTagVersion()
         await Git.Commit(path);
         await Git.AnnotatedTag(path, "2.3.4-alpha.5+build.6", "foo");
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", }, 0, "build.6");
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",], 0, "build.6");
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/BuildMetadata.cs b/MinVerTests.Packages/BuildMetadata.cs
index 7a8bd115..4733d716 100644
--- a/MinVerTests.Packages/BuildMetadata.cs
+++ b/MinVerTests.Packages/BuildMetadata.cs
@@ -14,7 +14,7 @@ public static async Task HasBuildMetadata()
         var path = MethodBase.GetCurrentMethod().GetTestDirectory();
         await Sdk.CreateProject(path);
         var envVars = ("MinVerBuildMetadata", "build.123");
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", }, 0, "build.123");
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",], 0, "build.123");
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/CommitAfterPreReleaseTag.cs b/MinVerTests.Packages/CommitAfterPreReleaseTag.cs
index 93fd00fd..64df5d0b 100644
--- a/MinVerTests.Packages/CommitAfterPreReleaseTag.cs
+++ b/MinVerTests.Packages/CommitAfterPreReleaseTag.cs
@@ -19,7 +19,7 @@ public static async Task HasHeightOne()
         await Git.Tag(path, "2.3.4-alpha.5");
         await Git.Commit(path);
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", }, 1);
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/CommitAfterRtmTag.cs b/MinVerTests.Packages/CommitAfterRtmTag.cs
index ac1a31bc..98a22f5a 100644
--- a/MinVerTests.Packages/CommitAfterRtmTag.cs
+++ b/MinVerTests.Packages/CommitAfterRtmTag.cs
@@ -19,7 +19,7 @@ public static async Task HasNextPatchWithHeightOne()
         await Git.Tag(path, "2.3.4");
         await Git.Commit(path);
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["alpha", "0",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/CommitAfterTagWithBuildMetadata.cs b/MinVerTests.Packages/CommitAfterTagWithBuildMetadata.cs
index e0e7a292..c6cf118c 100644
--- a/MinVerTests.Packages/CommitAfterTagWithBuildMetadata.cs
+++ b/MinVerTests.Packages/CommitAfterTagWithBuildMetadata.cs
@@ -19,7 +19,7 @@ public static async Task DoesNotHaveBuildMetadata()
         await Git.Tag(path, "2.3.4+build.5");
         await Git.Commit(path);
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["alpha", "0",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/CustomAutoIncrement.cs b/MinVerTests.Packages/CustomAutoIncrement.cs
index a938b2b3..3ad0d465 100644
--- a/MinVerTests.Packages/CustomAutoIncrement.cs
+++ b/MinVerTests.Packages/CustomAutoIncrement.cs
@@ -21,7 +21,7 @@ public static async Task HasCustomAutoIncrement()
 
         var envVars = ("MinVerAutoIncrement".ToAltCase(), "minor");
 
-        var expected = Package.WithVersion(2, 4, 0, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(2, 4, 0, ["alpha", "0",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/CustomDefaultPreReleaseIdentifiers.cs b/MinVerTests.Packages/CustomDefaultPreReleaseIdentifiers.cs
index fee5853e..c9c32234 100644
--- a/MinVerTests.Packages/CustomDefaultPreReleaseIdentifiers.cs
+++ b/MinVerTests.Packages/CustomDefaultPreReleaseIdentifiers.cs
@@ -22,7 +22,7 @@ public static async Task HasCustomDefaultPreReleaseIdentifiers()
 
         var envVars = ("MinVerDefaultPreReleaseIdentifiers".ToAltCase(), "preview.0");
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "preview", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["preview", "0",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
@@ -47,7 +47,7 @@ public static async Task HasCustomDefaultPreReleasePhase()
 
         var envVars = ("MinVerDefaultPreReleasePhase".ToAltCase(), "preview");
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "preview", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["preview", "0",], 1);
 
         // act
         var (actual, sdkStandardOutput, _) = await Sdk.BuildProject(path, envVars: envVars);
@@ -79,7 +79,7 @@ public static async Task HasCustomDefaultPreReleaseIdentifiersAndCustomDefaultPr
             ("MinVerDefaultPreReleasePhase", "foo"),
         };
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "preview", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["preview", "0",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/EmptyRepo.cs b/MinVerTests.Packages/EmptyRepo.cs
index 7813147c..fcded5c6 100644
--- a/MinVerTests.Packages/EmptyRepo.cs
+++ b/MinVerTests.Packages/EmptyRepo.cs
@@ -15,7 +15,7 @@ public static async Task HasDefaultVersion()
         var path = MethodBase.GetCurrentMethod().GetTestDirectory();
         await Sdk.CreateProject(path);
         await Git.Init(path);
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", });
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",]);
 
         // act
         var (actual, sdkStandardOutput, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/FirstCommit.cs b/MinVerTests.Packages/FirstCommit.cs
index d27c8a89..ead93377 100644
--- a/MinVerTests.Packages/FirstCommit.cs
+++ b/MinVerTests.Packages/FirstCommit.cs
@@ -17,7 +17,7 @@ public static async Task HasDefaultVersion()
         await Git.Init(path);
         await Git.Commit(path);
 
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", });
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",]);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/MinVerTests.Packages.csproj b/MinVerTests.Packages/MinVerTests.Packages.csproj
index 5e358fcf..cdab8da8 100644
--- a/MinVerTests.Packages/MinVerTests.Packages.csproj
+++ b/MinVerTests.Packages/MinVerTests.Packages.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RollForward>major</RollForward>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
diff --git a/MinVerTests.Packages/MinimumMajorMinorAfterTag.cs b/MinVerTests.Packages/MinimumMajorMinorAfterTag.cs
index 40fa9c3c..3ab657d0 100644
--- a/MinVerTests.Packages/MinimumMajorMinorAfterTag.cs
+++ b/MinVerTests.Packages/MinimumMajorMinorAfterTag.cs
@@ -21,7 +21,7 @@ public static async Task HasMinimumMajorMinorWithHeightOne()
 
         var envVars = ("MinVerMinimumMajorMinor".ToAltCase(), "3.0");
 
-        var expected = Package.WithVersion(3, 0, 0, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(3, 0, 0, ["alpha", "0",], 1);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/MinimumMajorMinorOnTag.cs b/MinVerTests.Packages/MinimumMajorMinorOnTag.cs
index 903ddfbb..212eb532 100644
--- a/MinVerTests.Packages/MinimumMajorMinorOnTag.cs
+++ b/MinVerTests.Packages/MinimumMajorMinorOnTag.cs
@@ -20,7 +20,7 @@ public static async Task HasMinimumMajorMinor()
 
         var envVars = ("MinVerMinimumMajorMinor".ToAltCase(), "3.0");
 
-        var expected = Package.WithVersion(3, 0, 0, new[] { "alpha", "0", });
+        var expected = Package.WithVersion(3, 0, 0, ["alpha", "0",]);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/MultipleProjects.cs b/MinVerTests.Packages/MultipleProjects.cs
index eea2610e..b2724aba 100644
--- a/MinVerTests.Packages/MultipleProjects.cs
+++ b/MinVerTests.Packages/MultipleProjects.cs
@@ -16,7 +16,7 @@ public async Task MultipleTagPrefixes()
         // arrange
         var path = MethodBase.GetCurrentMethod().GetTestDirectory();
 
-        await Sdk.CreateSolution(path, new[] { "project0", "project1", "project2", "project3", });
+        await Sdk.CreateSolution(path, ["project0", "project1", "project2", "project3",]);
 
         var props =
             $@"<Project>
@@ -48,7 +48,7 @@ public async Task MultipleTagPrefixes()
         Assert.NotNull(standardOutput);
 
         var versionCalculations = standardOutput
-            .Split(new[] { '\r', '\n', }, StringSplitOptions.RemoveEmptyEntries)
+            .ToNonEmptyLines()
             .Select(line => line.Trim())
             .Where(line => line.StartsWith("MinVer: Calculated version ", StringComparison.OrdinalIgnoreCase));
 
diff --git a/MinVerTests.Packages/NoRepo.cs b/MinVerTests.Packages/NoRepo.cs
index 2922905a..39c137fc 100644
--- a/MinVerTests.Packages/NoRepo.cs
+++ b/MinVerTests.Packages/NoRepo.cs
@@ -14,7 +14,7 @@ public static async Task HasDefaultVersion()
         // arrange
         var path = MethodBase.GetCurrentMethod().GetTestDirectory();
         await Sdk.CreateProject(path);
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", });
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",]);
 
         // act
         var (actual, sdkStandardOutput, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/NonVersionTag.cs b/MinVerTests.Packages/NonVersionTag.cs
index 89662b8a..2274558a 100644
--- a/MinVerTests.Packages/NonVersionTag.cs
+++ b/MinVerTests.Packages/NonVersionTag.cs
@@ -18,7 +18,7 @@ public static async Task HasDefaultVersion()
         await Git.Commit(path);
         await Git.Tag(path, "foo");
 
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", });
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",]);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/OptionMasking.cs b/MinVerTests.Packages/OptionMasking.cs
index b45574e5..d4f3a4c5 100644
--- a/MinVerTests.Packages/OptionMasking.cs
+++ b/MinVerTests.Packages/OptionMasking.cs
@@ -24,7 +24,7 @@ public static async Task AutoIncrementBackToDefault(string value)
         var envVars = ("MinVerAutoIncrement".ToAltCase(), "minor");
         var args = $"--auto-increment {value}";
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["alpha", "0",], 1);
 
         // act
         var (cliStandardOutput, _) = await MinVerCli.ReadAsync(path, args: args, envVars: envVars);
@@ -45,7 +45,7 @@ public static async Task BuildMetadataBackToDefault(string value)
         var envVars = ("MinVerBuildMetadata", "build.123");
         var args = $"--build-metadata {value}";
 
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", });
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",]);
 
         // act
         var (cliStandardOutput, _) = await MinVerCli.ReadAsync(path, args: args, envVars: envVars);
@@ -70,7 +70,7 @@ public static async Task DefaultPreReleaseIdentifiersBackToDefault(string value)
         var envVars = ("MinVerDefaultPreReleaseIdentifiers".ToAltCase(), "preview.0");
         var args = $"--default-pre-release-identifiers {value}";
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["alpha", "0",], 1);
 
         // act
         var (cliStandardOutput, _) = await MinVerCli.ReadAsync(path, args: args, envVars: envVars);
@@ -95,7 +95,7 @@ public static async Task DefaultPreReleasePhaseBackToDefault(string value)
         var envVars = ("MinVerDefaultPreReleasePhase".ToAltCase(), "preview");
         var args = $"--default-pre-release-phase {value}";
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "alpha", "0", }, 1);
+        var expected = Package.WithVersion(2, 3, 5, ["alpha", "0",], 1);
 
         // act
         var (cliStandardOutput, _) = await MinVerCli.ReadAsync(path, args: args, envVars: envVars);
@@ -143,7 +143,7 @@ public static async Task TagPrefixBackToDefault(string value)
         var envVars = ("MinVerTagPrefix", "v.");
         var args = $"--tag-prefix {value}";
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", });
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",]);
 
         // act
         var (cliStandardOutput, _) = await MinVerCli.ReadAsync(path, args: args, envVars: envVars);
diff --git a/MinVerTests.Packages/PreReleaseTag.cs b/MinVerTests.Packages/PreReleaseTag.cs
index f680f746..1c7fe527 100644
--- a/MinVerTests.Packages/PreReleaseTag.cs
+++ b/MinVerTests.Packages/PreReleaseTag.cs
@@ -18,7 +18,7 @@ public static async Task HasTagVersion()
         await Git.Commit(path);
         await Git.Tag(path, "2.3.4-alpha.5");
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", });
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",]);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/SourceLink.cs b/MinVerTests.Packages/SourceLink.cs
index fe41ce6d..86712807 100644
--- a/MinVerTests.Packages/SourceLink.cs
+++ b/MinVerTests.Packages/SourceLink.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -13,10 +14,15 @@ public static async Task HasCommitSha()
     {
         // arrange
         var path = MethodBase.GetCurrentMethod().GetTestDirectory();
-        await Sdk.CreateProject(path);
+        await Sdk.CreateProject(path, enableSourceLink: true);
 
-        _ = await Sdk.DotNet($"add package Microsoft.SourceLink.GitHub --version 1.1.1 --package-directory packages", path);
-        _ = await Sdk.DotNet("restore --packages packages", path);
+        if (string.IsNullOrEmpty(Sdk.Version) ||
+            int.Parse(Sdk.Version.Split(".")[0], NumberStyles.None, CultureInfo.InvariantCulture) < 8)
+        {
+            _ = await Sdk.DotNet(
+                $"add package Microsoft.SourceLink.GitHub --version 1.1.1 --package-directory packages", path);
+            _ = await Sdk.DotNet("restore --packages packages", path);
+        }
 
         await Git.Init(path);
         await Git.Commit(path);
@@ -24,7 +30,7 @@ public static async Task HasCommitSha()
 
         var buildMetadata = "build.123";
         var envVars = ("MinVerBuildMetadata", buildMetadata);
-        var expected = Package.WithVersion(0, 0, 0, new[] { "alpha", "0", }, 0, $"build.123", $".{sha}");
+        var expected = Package.WithVersion(0, 0, 0, ["alpha", "0",], 0, $"build.123", $".{sha}");
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/TagWithBuildMetadata.cs b/MinVerTests.Packages/TagWithBuildMetadata.cs
index 43d3d4ec..c5157b09 100644
--- a/MinVerTests.Packages/TagWithBuildMetadata.cs
+++ b/MinVerTests.Packages/TagWithBuildMetadata.cs
@@ -18,7 +18,7 @@ public static async Task HasTagVersion()
         await Git.Commit(path);
         await Git.Tag(path, "2.3.4-alpha.5+build.6");
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", }, 0, "build.6");
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",], 0, "build.6");
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/TagWithPrefix.cs b/MinVerTests.Packages/TagWithPrefix.cs
index f0eb3248..3f280c4b 100644
--- a/MinVerTests.Packages/TagWithPrefix.cs
+++ b/MinVerTests.Packages/TagWithPrefix.cs
@@ -20,7 +20,7 @@ public static async Task HasTagVersion()
 
         var envVars = ("MinVerTagPrefix", "v.");
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", });
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",]);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/MinVerTests.Packages/TwoCommitsAfterPreReleaseTag.cs b/MinVerTests.Packages/TwoCommitsAfterPreReleaseTag.cs
index 4c510ba1..0c1601ca 100644
--- a/MinVerTests.Packages/TwoCommitsAfterPreReleaseTag.cs
+++ b/MinVerTests.Packages/TwoCommitsAfterPreReleaseTag.cs
@@ -20,7 +20,7 @@ public static async Task HasHeightTwo()
         await Git.Commit(path);
         await Git.Commit(path);
 
-        var expected = Package.WithVersion(2, 3, 4, new[] { "alpha", "5", }, 2);
+        var expected = Package.WithVersion(2, 3, 4, ["alpha", "5",], 2);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/TwoCommitsAfterRtmTag.cs b/MinVerTests.Packages/TwoCommitsAfterRtmTag.cs
index 35615bf6..e85e3ae0 100644
--- a/MinVerTests.Packages/TwoCommitsAfterRtmTag.cs
+++ b/MinVerTests.Packages/TwoCommitsAfterRtmTag.cs
@@ -20,7 +20,7 @@ public static async Task HasNextPatchWithHeightTwo()
         await Git.Commit(path);
         await Git.Commit(path);
 
-        var expected = Package.WithVersion(2, 3, 5, new[] { "alpha", "0", }, 2);
+        var expected = Package.WithVersion(2, 3, 5, ["alpha", "0",], 2);
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path);
diff --git a/MinVerTests.Packages/VersionOverride.cs b/MinVerTests.Packages/VersionOverride.cs
index 3d3e7436..490eac4c 100644
--- a/MinVerTests.Packages/VersionOverride.cs
+++ b/MinVerTests.Packages/VersionOverride.cs
@@ -20,7 +20,7 @@ public static async Task HasVersionOverride()
 
         var envVars = ("MinVerVersionOverride".ToAltCase(), "3.4.5-alpha.6+build.7");
 
-        var expected = Package.WithVersion(3, 4, 5, new[] { "alpha", "6", }, 0, "build.7");
+        var expected = Package.WithVersion(3, 4, 5, ["alpha", "6",], 0, "build.7");
 
         // act
         var (actual, _, _) = await Sdk.BuildProject(path, envVars: envVars);
diff --git a/global.json b/global.json
index 67aa874f..fb5108f3 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMajor"
   }
 }
diff --git a/minver-cli/Logger.cs b/minver-cli/Logger.cs
index 92dd1f0d..b266cae6 100644
--- a/minver-cli/Logger.cs
+++ b/minver-cli/Logger.cs
@@ -3,11 +3,9 @@
 
 namespace MinVer;
 
-internal sealed class Logger : ILogger
+internal sealed class Logger(Verbosity verbosity) : ILogger
 {
-    private readonly Verbosity verbosity;
-
-    public Logger(Verbosity verbosity) => this.verbosity = verbosity;
+    private readonly Verbosity verbosity = verbosity;
 
     public bool IsTraceEnabled => this.verbosity >= Verbosity.Trace;
 
diff --git a/minver-cli/minver-cli.csproj b/minver-cli/minver-cli.csproj
index 5b61e768..bc16ab30 100644
--- a/minver-cli/minver-cli.csproj
+++ b/minver-cli/minver-cli.csproj
@@ -14,14 +14,13 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <RootNamespace>MinVer</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ToolCommandName>minver</ToolCommandName>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/targets/Program.cs b/targets/Program.cs
index f668065b..7d5186d3 100644
--- a/targets/Program.cs
+++ b/targets/Program.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using MinVerTests.Infra;
 using static Bullseye.Targets;
 using static SimpleExec.Command;
 
-var testFx = Environment.GetEnvironmentVariable("MINVER_TESTS_FRAMEWORK") ?? "net7.0";
+var testFx = Environment.GetEnvironmentVariable("MINVER_TESTS_FRAMEWORK") ?? "net8.0";
 var testLoggerArgs = new List<string> { "--logger", "\"console;verbosity=normal\"", };
 
 if (Environment.GetEnvironmentVariable("GITHUB_ACTIONS")?.ToUpperInvariant() == "TRUE")
 {
-    testLoggerArgs.AddRange(new[] { "--logger", "GitHubActions", });
+    testLoggerArgs.AddRange(["--logger", "GitHubActions",]);
 }
 
 Target("build", () => RunAsync("dotnet", "build --configuration Release --nologo"));
@@ -19,13 +18,13 @@
     "test-lib",
     "test the MinVer.Lib library",
     DependsOn("build"),
-    () => RunAsync("dotnet", new[] { "test", "./MinVerTests.Lib", "--framework", testFx, "--configuration", "Release", "--no-build", "--nologo", }.Concat(testLoggerArgs)));
+    () => RunAsync("dotnet", ["test", "./MinVerTests.Lib", "--framework", testFx, "--configuration", "Release", "--no-build", "--nologo", .. testLoggerArgs]));
 
 Target(
     "test-packages",
     "test the MinVer package and the minver-cli console app",
     DependsOn("build"),
-    () => RunAsync("dotnet", new[] { "test", "./MinVerTests.Packages", "--configuration", "Release", "--no-build", "--nologo", }.Concat(testLoggerArgs)));
+    () => RunAsync("dotnet", ["test", "./MinVerTests.Packages", "--configuration", "Release", "--no-build", "--nologo", .. testLoggerArgs]));
 
 Target(
     "eyeball-minver-logs",
diff --git a/targets/Targets.csproj b/targets/Targets.csproj
index deb58432..340ac10e 100644
--- a/targets/Targets.csproj
+++ b/targets/Targets.csproj
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RollForward>major</RollForward>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>