Upgrade to .NET 9.0

dotnet · Nov 14, 2024 · c7b1f70 · c7b1f70
1 parent c0b8bd6
commit c7b1f70
Show file tree

Hide file tree

Showing 34 changed files with 146 additions and 128 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,7 +13,7 @@ on:
     - '**.sln'
 
 env:
-  DOTNET_VERSION: '8.0.x' # SDK version
+  DOTNET_VERSION: '9.0.x' # SDK version
 
 jobs:
   build:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -54,7 +54,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@main
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     - name: Install dependencies
       run: dotnet restore

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,17 +8,17 @@
     <PackageVersion Include="GitHub.Actions.Core" Version="8.1.1" />
     <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.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.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.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Octokit" Version="13.0.1" />
-    <PackageVersion Include="Pathological.ProjectSystem" Version="8.0.4" />
+    <PackageVersion Include="Pathological.ProjectSystem" Version="9.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 </Project>
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>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/DotNet.Extensions/GlobalUsings.cs b/src/DotNet.Extensions/GlobalUsings.cs
@@ -9,5 +9,6 @@
 global using System.Text.Encodings.Web;
 global using System.Text.Json;
 global using System.Text.Json.Serialization;
+global using System.Text.Json.Serialization.Metadata;
 global using System.Threading.Tasks;
 global using static System.Text.Json.JsonSerializer;
diff --git a/src/DotNet.Extensions/ObjectExtensions.cs b/src/DotNet.Extensions/ObjectExtensions.cs
@@ -5,20 +5,11 @@ namespace DotNet.Extensions;
 
 public static class ObjectExtensions
 {
-    static readonly Lazy<JsonSerializerOptions> s_lazyOptions = new(() => new()
-    {
-        Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) },
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString,
-        PropertyNameCaseInsensitive = true,
-        AllowTrailingCommas = true,
-    });
+    public static string? ToJson<T>(this T value, JsonTypeInfo<T> jsonTypeInfo) =>
+        value is null ? null : Serialize(value, jsonTypeInfo);
 
-    public static string? ToJson(this object value, JsonSerializerOptions? options = default) =>
-        value is null ? null : Serialize(value, options ?? s_lazyOptions.Value);
-
-    public static T? FromJson<T>(this string? json, JsonSerializerOptions? options = default) =>
-        string.IsNullOrWhiteSpace(json) ? default : Deserialize<T>(json, options ?? s_lazyOptions.Value);
+    public static T? FromJson<T>(this string? json, JsonTypeInfo<T> jsonTypeInfo) =>
+        string.IsNullOrWhiteSpace(json) ? default : Deserialize<T>(json, jsonTypeInfo);
 
     public static DateTime? ToDateTime(this string? value) =>
         value is null ? default : DateTime.TryParse(value, out global::System.DateTime dateTime) ? dateTime : null;

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

diff --git a/src/DotNet.GitHub/GitHubGraphQLClient.cs b/src/DotNet.GitHub/GitHubGraphQLClient.cs
@@ -25,11 +25,6 @@ ... on Issue {
         """;
 
     static readonly Uri s_graphQLUri = new("https://api.github.com/graphql");
-    static readonly JsonSerializerOptions s_options = new()
-    {
-        Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) },
-        PropertyNameCaseInsensitive = true
-    };
 
     readonly HttpClient _httpClient;
     readonly ILogger<GitHubGraphQLClient> _logger;
@@ -63,7 +58,8 @@ public GitHubGraphQLClient(HttpClient httpClient, ILogger<GitHubGraphQLClient> l
             response.EnsureSuccessStatusCode();
 
             string json = await response.Content.ReadAsStringAsync();
-            GraphQLResult<ExistingIssue>? result = json.FromJson<GraphQLResult<ExistingIssue>>(s_options);
+            GraphQLResult<ExistingIssue>? result = json.FromJson<GraphQLResult<ExistingIssue>>(
+                GitHubJsonSerializerContext.Default.GraphQLResultExistingIssue);
 
             return (false, result?.Data?.Search?.Nodes
                 ?.Where(i => i.State == ItemState.Open)

diff --git a/src/DotNet.GitHub/GitHubJsonSerializerContext.cs b/src/DotNet.GitHub/GitHubJsonSerializerContext.cs
@@ -0,0 +1,15 @@
+// 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;
+
+[JsonSourceGenerationOptions(
+    PropertyNameCaseInsensitive = true,
+    Converters = [ typeof(JsonStringEnumConverter) ]
+)]
+[JsonSerializable(typeof(GraphQLRequest))]
+[JsonSerializable(typeof(ExistingIssue))]
+[JsonSerializable(typeof(GraphQLResult<ExistingIssue>))]
+internal partial class GitHubJsonSerializerContext : JsonSerializerContext
+{
+}
diff --git a/src/DotNet.GitHub/GraphQLRequest.cs b/src/DotNet.GitHub/GraphQLRequest.cs
@@ -9,7 +9,8 @@ public record GraphQLRequest
     public string Query { get; init; } = "";
 
     [JsonPropertyName("variables")]
-    public Dictionary<string, string> Variables { get; init; } = new();
+    public Dictionary<string, string> Variables { get; init; } = [];
 
-    public override string ToString() => this.ToJson()!;
+    public override string ToString() =>
+        this.ToJson(GitHubJsonSerializerContext.Default.GraphQLRequest)!;
 }
diff --git a/src/DotNet.GitHub/ModelExtensions.cs b/src/DotNet.GitHub/ModelExtensions.cs
@@ -29,8 +29,7 @@ The following project file(s) target a .NET version that's no longer supported.
                 new("End of life"),
                 new("Release notes"),
                 new("Nearest LTS TFM version")),
-            new[]
-            {
+            [
                     new MarkdownTableRow(
                     $"`{tfmSupport.TargetFrameworkMoniker}`",
                     tfmSupport.Release.EndOfLifeDate.HasValue
@@ -39,7 +38,7 @@ The following project file(s) target a .NET version that's no longer supported.
                         $"{tfmSupport.TargetFrameworkMoniker} release notes", tfmSupport.Release.ReleaseNotesUrl)
                         .ToString(),
                     $"`{tfmSupport.NearestLtsVersion}`")
-            });
+            ]);
 
         document.AppendList(
             new MarkdownList(
@@ -96,8 +95,7 @@ The following Dockerfile(s) target a .NET version that's no longer supported.
                 new("End of life"),
                 new("Release notes"),
                 new("Nearest LTS TFM version")),
-            new[]
-            {
+            [
                     new MarkdownTableRow(
                     $"`{tfmSupport.TargetFrameworkMoniker}`",
                     tfmSupport.Release.EndOfLifeDate.HasValue
@@ -106,7 +104,7 @@ The following Dockerfile(s) target a .NET version that's no longer supported.
                         $"{tfmSupport.TargetFrameworkMoniker} release notes", tfmSupport.Release.ReleaseNotesUrl)
                         .ToString(),
                     $"`{tfmSupport.NearestLtsVersion}`")
-            });
+            ]);
 
         document.AppendList(
             new MarkdownList(

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">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

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">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/DotNet.Releases/Framework/FrameworkReleaseService.cs b/src/DotNet.Releases/Framework/FrameworkReleaseService.cs
@@ -25,7 +25,8 @@ await cache.GetOrCreateAsync(
 
                         string json = await reader.ReadToEndAsync();
 
-                        return json.FromJson<FrameworkRelease>(new());
+                        return json.FromJson<FrameworkRelease>(
+                            ReleasesJsonSerializerContext.Default.FrameworkRelease);
                     });
 
             yield return frameworkRelease!;

diff --git a/src/DotNet.Releases/GlobalUsings.cs b/src/DotNet.Releases/GlobalUsings.cs
@@ -3,6 +3,7 @@
 
 global using System.Collections.Concurrent;
 global using System.Collections.ObjectModel;
+global using System.Text.Json.Serialization;
 global using System.Reflection;
 global using DotNet.Extensions;
 global using DotNet.Models;

diff --git a/src/DotNet.Releases/ReleasesJsonSerializerContext.cs b/src/DotNet.Releases/ReleasesJsonSerializerContext.cs
@@ -0,0 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace DotNet.Releases;
+
+[JsonSerializable(typeof(FrameworkRelease))]
+internal partial class ReleasesJsonSerializerContext : JsonSerializerContext;
diff --git a/src/DotNet.VersionSweeper/DotNet.VersionSweeper.csproj b/src/DotNet.VersionSweeper/DotNet.VersionSweeper.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateRuntimeConfigurationFile>true</GenerateRuntimeConfigurationFile>
     <Nullable>enable</Nullable>

diff --git a/src/DotNet.VersionSweeper/GlobalUsings.cs b/src/DotNet.VersionSweeper/GlobalUsings.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 global using System.Text;
+global using System.Text.Json;
 global using System.Text.Json.Serialization;
 global using Actions.Core.Extensions;
 global using Actions.Core.Services;

diff --git a/src/DotNet.VersionSweeper/Program.cs b/src/DotNet.VersionSweeper/Program.cs
@@ -152,7 +152,7 @@ await CreateAndEnqueueAsync(
                     options, o => projectSupportReports.ToMarkdownBody(tfm, o));
             }
         }
-        else // We we're instructed to create pull requests.
+        else // We were instructed to create pull requests.
         {
             string[] upgradeProjects =
                 tfmToProjectSupportReports.Values
@@ -166,7 +166,7 @@ await CreateAndEnqueueAsync(
             hasRemainingWork = upgradeProjects is { Length: > 0 };
             if (hasRemainingWork)
             {
-                string json = upgradeProjects.ToJson() ?? "";
+                string json = upgradeProjects.ToJson(SweeperJsonSerializerContext.Default.StringArray) ?? "";
                 await job.SetOutputAsync("upgrade-projects", json);
             }
         }
@@ -194,7 +194,7 @@ await CreateAndEnqueueAsync(
         }
 
         await job.SetOutputAsync(
-            "has-remaining-work", hasRemainingWork.ToJson() ?? "false");
+            "has-remaining-work", hasRemainingWork);
     }
     catch (Exception ex)
     {

diff --git a/src/DotNet.VersionSweeper/SweeperJsonSerializerContext.cs b/src/DotNet.VersionSweeper/SweeperJsonSerializerContext.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+[JsonSourceGenerationOptions(
+    defaults: JsonSerializerDefaults.Web,
+    WriteIndented = true,
+    UseStringEnumConverter = true,
+    AllowTrailingCommas = true,
+    NumberHandling = JsonNumberHandling.AllowReadingFromString,
+    PropertyNameCaseInsensitive = false,
+    IncludeFields = true)]
+[JsonSerializable(typeof(string[]))]
+[JsonSerializable(typeof(VersionSweeperConfig))]
+internal partial class SweeperJsonSerializerContext : JsonSerializerContext;
diff --git a/src/DotNet.VersionSweeper/VersionSweeperConfig.cs b/src/DotNet.VersionSweeper/VersionSweeperConfig.cs
@@ -50,7 +50,7 @@ internal static async Task<VersionSweeperConfig> ReadAsync(string root, ICoreSer
                 job.WriteInfo($"Reading '{fullPath}' config file.");
 
                 string configJson = await File.ReadAllTextAsync(fullPath);
-                VersionSweeperConfig config = configJson.FromJson<VersionSweeperConfig>() ?? new();
+                VersionSweeperConfig config = configJson.FromJson<VersionSweeperConfig>(SweeperJsonSerializerContext.Default.VersionSweeperConfig) ?? new();
 
                 job.WriteInfo($"Read {config.Ignore.Length} pattern(s) to ignore:");
                 job.WriteInfo($"{string.Join(",", config.Ignore.Select(val => $"\t{val}"))}");

diff --git a/test/DotNet.ExtensionsTests/DotNet.ExtensionsTests.csproj b/test/DotNet.ExtensionsTests/DotNet.ExtensionsTests.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>