Upgrade to .NET 8.0 (#102)

* Checkpoint * Skip impossible test for now... * Dockerfile too * Fix rebase issues. * A bit of clean up * Not sure * Apply suggestions from code review
dotnet · Nov 30, 2023 · cef2113 · cef2113
1 parent fd9dd57
commit cef2113
Show file tree

Hide file tree

Showing 44 changed files with 176 additions and 191 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -11,7 +11,7 @@ on:
     - '**.sln'
 
 env:
-  DOTNET_VERSION: '7.0.x' # SDK version
+  DOTNET_VERSION: '8.0.x' # SDK version
 
 jobs:
   build:
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@main
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@main
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@main
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -51,10 +51,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Setup .NET 7.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@main
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,23 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Bogus" Version="34.0.2" />
+    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="GitHub.Actions.Core" Version="8.0.3" />
+    <PackageVersion Include="MarkdownBuilder" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Octokit" Version="9.0.0" />
+    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
+  </ItemGroup>
+</Project>
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 
 # Copy everything and restore
 WORKDIR /app
@@ -16,6 +16,6 @@ LABEL com.github.actions.icon="alert-circle"
 LABEL com.github.actions.color="yellow"
 
 # Build the runtime image
-FROM mcr.microsoft.com/dotnet/runtime:7.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 COPY --from=build-env /app/out .
 ENTRYPOINT [ "dotnet", "/DotNet.VersionSweeper.dll" ]
diff --git a/dotnet-versionsweeper.sln b/dotnet-versionsweeper.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
 		CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md
 		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		Directory.Packages.props = Directory.Packages.props
 		Dockerfile = Dockerfile
 		.github\workflows\dog-food.yml = .github\workflows\dog-food.yml
 		dotnet-versionsweeper.json = dotnet-versionsweeper.json

diff --git a/src/DotNet.Extensions/DotNet.Extensions.csproj b/src/DotNet.Extensions/DotNet.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/DotNet.Extensions/EnumerableExtensions.cs b/src/DotNet.Extensions/EnumerableExtensions.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Concurrent;
-
 namespace DotNet.Extensions;
 
 // https://blogs.msdn.microsoft.com/pfxteam/2012/03/05/implementing-a-simple-foreachasync-part-2/

diff --git a/src/DotNet.Extensions/GlobalUsings.cs b/src/DotNet.Extensions/GlobalUsings.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 global using System;
+global using System.Collections.Concurrent;
 global using System.Collections.Generic;
 global using System.Linq;
 global using System.Text;

diff --git a/src/DotNet.GitHub/DotNet.GitHub.csproj b/src/DotNet.GitHub/DotNet.GitHub.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MarkdownBuilder" Version="0.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageReference Include="Octokit" Version="7.0.1" />
+    <PackageReference Include="MarkdownBuilder" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Http" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Octokit" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DotNet.GitHub/GraphQLRequest.cs b/src/DotNet.GitHub/GraphQLRequest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.GitHub;

diff --git a/src/DotNet.GitHub/RateLimitAwareQueue.cs b/src/DotNet.GitHub/RateLimitAwareQueue.cs
@@ -1,19 +1,15 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.GitHub;
 
-public sealed class RateLimitAwareQueue
+public sealed class RateLimitAwareQueue(IGitHubIssueService gitHubIssueService)
 {
     const int DelayBetweenPostCalls = 1_000;
 
     readonly HashSet<string> _uniqueTitles = new(StringComparer.OrdinalIgnoreCase);
     readonly ConcurrentQueue<(GitHubApiArgs, NewIssue)> _newIssuesQueue = new();
     readonly ConcurrentQueue<(GitHubApiArgs, IssueUpdate)> _updateIssuesQueue = new();
-    readonly IGitHubIssueService _gitHubIssueService;
-
-    public RateLimitAwareQueue(IGitHubIssueService gitHubIssueService) =>
-        _gitHubIssueService = gitHubIssueService;
 
     public void Enqueue(GitHubApiArgs args, NewIssue issue)
     {
@@ -31,8 +27,8 @@ public void Enqueue(GitHubApiArgs args, IssueUpdate issue) =>
         while (_newIssuesQueue is { IsEmpty: false }
             && _newIssuesQueue.TryDequeue(out (GitHubApiArgs, NewIssue) newItem))
         {
-            (GitHubApiArgs args, NewIssue newIssue) = newItem;
-            Issue issue = await _gitHubIssueService.PostIssueAsync(
+            var (args, newIssue) = newItem;
+            var issue = await gitHubIssueService.PostIssueAsync(
                 args.Owner, args.RepoName, args.Token, newIssue);
 
             yield return ("Created issue", issue.HtmlUrl);
@@ -43,8 +39,8 @@ public void Enqueue(GitHubApiArgs args, IssueUpdate issue) =>
         while (_updateIssuesQueue is { IsEmpty: false }
             && _updateIssuesQueue.TryDequeue(out (GitHubApiArgs, IssueUpdate) updatedItem))
         {
-            (GitHubApiArgs args, IssueUpdate newIssue) = updatedItem;
-            Issue issue = await _gitHubIssueService.UpdateIssueAsync(
+            var (args, newIssue) = updatedItem;
+            var issue = await gitHubIssueService.UpdateIssueAsync(
                 args.Owner, args.RepoName, args.Token, args.IssueNumber, newIssue);
 
             yield return ("Updated issue", issue.HtmlUrl);

diff --git a/src/DotNet.GitHubActions/DotNet.GitHubActions.csproj b/src/DotNet.GitHubActions/DotNet.GitHubActions.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
 </Project>
diff --git a/src/DotNet.IO/DotNet.IO.csproj b/src/DotNet.IO/DotNet.IO.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DotNet.IO/Project/ProjectJson.cs b/src/DotNet.IO/Project/ProjectJson.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.IO;

diff --git a/src/DotNet.IO/Solution/SolutionFileReader.cs b/src/DotNet.IO/Solution/SolutionFileReader.cs
@@ -1,15 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.IO;
 
-public sealed partial class SolutionFileReader : ISolutionFileReader
+public sealed partial class SolutionFileReader(IProjectFileReader projectFileReader)
+    : ISolutionFileReader
 {
-    readonly IProjectFileReader _projectFileReader;
-
-    public SolutionFileReader(IProjectFileReader projectFileReader) =>
-        _projectFileReader = projectFileReader;
-
     public async ValueTask<Solution> ReadSolutionAsync(string solutionPath)
     {
         Solution solution = new();
@@ -32,7 +28,7 @@ public async ValueTask<Solution> ReadSolutionAsync(string solutionPath)
                     continue;
                 }
 
-                Project project = await _projectFileReader.ReadProjectAsync(fullPath);
+                var project = await projectFileReader.ReadProjectAsync(fullPath);
                 solution.Projects.Add(project);
             }
         }

diff --git a/src/DotNet.Models/DotNet.Models.csproj b/src/DotNet.Models/DotNet.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Deployment.DotNet.Releases" />
   </ItemGroup>
 
 </Project>
diff --git a/src/DotNet.Models/FrameworkRelease.cs b/src/DotNet.Models/FrameworkRelease.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.Models;
@@ -29,7 +29,7 @@ var version when version.StartsWith("net", StringComparison.OrdinalIgnoreCase) =
     public SupportPhase SupportPhase => EndOfLifeDate switch
     {
         var date when date is null && Version is "4.8" => SupportPhase.Active,
-        var date when date > DateTimeOffset.UtcNow => SupportPhase.GoLive,
+        var date when date > DateTimeOffset.UtcNow => SupportPhase.Active,
 
         _ => SupportPhase.EOL
     };

diff --git a/src/DotNet.Models/Solution.cs b/src/DotNet.Models/Solution.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.Models;
@@ -7,5 +7,5 @@ public sealed class Solution
 {
     public string FullPath { get; set; } = null!;
 
-    public HashSet<Project> Projects { get; } = new();
+    public HashSet<Project> Projects { get; } = [];
 }
diff --git a/src/DotNet.Models/SolutionSupportReport.cs b/src/DotNet.Models/SolutionSupportReport.cs
@@ -1,9 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace DotNet.Models;
 
 public record SolutionSupportReport(Solution Solution)
 {
-    public HashSet<ProjectSupportReport> ProjectSupportReports { get; } = new();
+    public HashSet<ProjectSupportReport> ProjectSupportReports { get; } = [];
 }
diff --git a/src/DotNet.Releases/Core/CoreReleaseIndexService.cs b/src/DotNet.Releases/Core/CoreReleaseIndexService.cs
@@ -1,27 +1,21 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.ObjectModel;
-
 namespace DotNet.Releases;
 
-internal sealed class CoreReleaseIndexService : ICoreReleaseIndexService
+public sealed class CoreReleaseIndexService(IMemoryCache cache) : ICoreReleaseIndexService
 {
     const string NetCoreKey = nameof(NetCoreKey);
 
-    readonly IMemoryCache _cache;
-
-    public CoreReleaseIndexService(IMemoryCache cache) => _cache = cache;
-
-    Task<ReadOnlyDictionary<Product, IReadOnlyCollection<ProductRelease>>?>
+    Task<ReadOnlyDictionary<Product, ReadOnlyCollection<ProductRelease>>?>
         ICoreReleaseIndexService.GetReleasesAsync() =>
-        _cache.GetOrCreateAsync(
+        cache.GetOrCreateAsync(
             NetCoreKey,
-            async entry =>
+            static async entry =>
             {
                 ProductCollection products = await ProductCollection.GetAsync();
 
-                var map = new ConcurrentDictionary<Product, IReadOnlyCollection<ProductRelease>>();
+                var map = new ConcurrentDictionary<Product, ReadOnlyCollection<ProductRelease>>();
                 await Parallel.ForEachAsync(products, async (product, token) =>
                 {
                     map[product] = await product.GetReleasesAsync();

diff --git a/src/DotNet.Releases/Core/ICoreReleaseIndexService.cs b/src/DotNet.Releases/Core/ICoreReleaseIndexService.cs
@@ -1,18 +1,16 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.ObjectModel;
-
 namespace DotNet.Releases;
 
 public interface ICoreReleaseIndexService
 {
-    Task<ReadOnlyDictionary<Product, IReadOnlyCollection<ProductRelease>>?> GetReleasesAsync();
+    Task<ReadOnlyDictionary<Product, ReadOnlyCollection<ProductRelease>>?> GetReleasesAsync();
 
     async ValueTask<Product?> GetNextLtsVersionAsync(string releaseVersion)
     {
         var version = new ReleaseVersion(releaseVersion);
-        ReadOnlyDictionary<Product, IReadOnlyCollection<ProductRelease>>? products = await GetReleasesAsync();
+        ReadOnlyDictionary<Product, ReadOnlyCollection<ProductRelease>>? products = await GetReleasesAsync();
 
         return products?.SelectMany(kvp => kvp.Value)
             .Where(release => release.Version > version && !release.Product.IsOutOfSupport())

diff --git a/src/DotNet.Releases/DotNet.Releases.csproj b/src/DotNet.Releases/DotNet.Releases.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -41,11 +41,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Deployment.DotNet.Releases" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="System.Linq.Async" />
   </ItemGroup>
 
   <ItemGroup>