Upgrade to .NET 10 - Update configuration and fix code issues

Copilot · adamhathcock · Copilot · commit 8a4f6bfdc949 · 2025-10-25T15:27:21.000Z
Co-authored-by: adamhathcock &lt;527620+adamhathcock@users.noreply.github.com&gt;
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -11,5 +11,5 @@ jobs:
     - uses: actions/checkout@v5
     - uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.204
+        dotnet-version: 10.0.100-rc.2.25502.107
     - run: dotnet run --project build/build.csproj
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <AnalysisMode>Recommended</AnalysisMode>
     <WarningsAsErrors>true</WarningsAsErrors>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,18 +4,30 @@
     <PackageVersion Include="Bullseye" Version="6.0.0" />
     <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
     <PackageVersion Include="Glob" Version="1.1.9" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.13" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.13" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.13" />
+    <PackageVersion
+      Include="Microsoft.AspNetCore.Authentication.JwtBearer"
+      Version="10.0.0-rc.2.25502.107"
+    />
+    <PackageVersion
+      Include="Microsoft.EntityFrameworkCore.InMemory"
+      Version="10.0.0-rc.2.25502.107"
+    />
+    <PackageVersion
+      Include="Microsoft.EntityFrameworkCore.Sqlite"
+      Version="10.0.0-rc.2.25502.107"
+    />
+    <PackageVersion
+      Include="Microsoft.EntityFrameworkCore.SqlServer"
+      Version="10.0.0-rc.2.25502.107"
+    />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Serilog" Version="4.3.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="FluentValidation" Version="12.0.0" />
     <PackageVersion Include="MediatR" Version="12.5.0" />
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.4" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
   </ItemGroup>
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 COPY . .
 RUN dotnet run --project build/build.csproj -- publish
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
 
 WORKDIR /app
 COPY --from=build /src/publish .
diff --git a/build/Program.cs b/build/Program.cs
@@ -43,7 +43,7 @@ void RemoveDirectory(string d)
     }
 );
 
-Target(Build, [Format], () => Run("dotnet", "build . -c Release"));
+Target(Build, [Format], () => Run("dotnet", "build Conduit.sln -c Release"));
 
 Target(
     Test,
@@ -67,7 +67,7 @@ void RemoveDirectory(string d)
     {
         Run(
             "dotnet",
-            $"publish {project} -c Release -f net8.0 -o ./publish --no-restore --no-build --verbosity=normal"
+            $"publish {project} -c Release -f net10.0 -o ./publish --no-restore --no-build --verbosity=normal"
         );
     }
 );
diff --git a/build/packages.lock.json b/build/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 2,
   "dependencies": {
-    "net8.0": {
+    "net10.0": {
       "Bullseye": {
         "type": "Direct",
         "requested": "[6.0.0, )",
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "8.0.201",
+      "version": "10.0.100-rc.2.25502.107",
       "rollForward": "latestFeature"
     }
   }
diff --git a/src/Conduit/Domain/Article.cs b/src/Conduit/Domain/Article.cs
@@ -31,7 +31,7 @@ public class Article
 
     [NotMapped]
     public List<string> TagList =>
-        ArticleTags.Where(x => x.TagId is not null).Select(x => x.TagId!).ToList();
+        [.. ArticleTags.Where(x => x.TagId is not null).Select(x => x.TagId!)];
 
     [JsonIgnore]
     public List<ArticleTag> ArticleTags { get; init; } = new();
diff --git a/src/Conduit/Features/Articles/Edit.cs b/src/Conduit/Features/Articles/Edit.cs
@@ -69,7 +69,7 @@ CancellationToken cancellationToken
 
             // ensure context is tracking any tags that are about to be created so that it won't attempt to insert a duplicate
             context.Tags.AttachRange(
-                articleTagsToCreate.Where(x => x.Tag is not null).Select(a => a.Tag!).ToArray()
+                [.. articleTagsToCreate.Where(x => x.Tag is not null).Select(a => a.Tag!)]
             );
 
             // add the new article tags
diff --git a/src/Conduit/Features/Profiles/IProfileReader.cs b/src/Conduit/Features/Profiles/IProfileReader.cs
@@ -5,5 +5,5 @@ namespace Conduit.Features.Profiles;
 
 public interface IProfileReader
 {
-    Task<ProfileEnvelope> ReadProfile(string username, CancellationToken cancellationToken);
+    public Task<ProfileEnvelope> ReadProfile(string username, CancellationToken cancellationToken);
 }
diff --git a/src/Conduit/Features/Users/Login.cs b/src/Conduit/Features/Users/Login.cs
@@ -54,14 +54,12 @@ public async Task<UserEnvelope> Handle(Command message, CancellationToken cancel
                 );
             }
 
-            if (
-                !person.Hash.SequenceEqual(
-                    await passwordHasher.Hash(
-                        message.User.Password ?? throw new InvalidOperationException(),
-                        person.Salt
-                    )
-                )
-            )
+            var hash = await passwordHasher.Hash(
+                message.User.Password ?? throw new InvalidOperationException(),
+                person.Salt
+            );
+
+            if (!person.Hash.SequenceEqual(hash))
             {
                 throw new RestException(
                     HttpStatusCode.Unauthorized,
diff --git a/src/Conduit/Infrastructure/ConduitContext.cs b/src/Conduit/Infrastructure/ConduitContext.cs
@@ -98,11 +98,8 @@ public void CommitTransaction()
         }
         finally
         {
-            if (_currentTransaction != null)
-            {
-                _currentTransaction.Dispose();
-                _currentTransaction = null;
-            }
+            _currentTransaction?.Dispose();
+            _currentTransaction = null;
         }
     }
 
@@ -114,11 +111,8 @@ public void RollbackTransaction()
         }
         finally
         {
-            if (_currentTransaction != null)
-            {
-                _currentTransaction.Dispose();
-                _currentTransaction = null;
-            }
+            _currentTransaction?.Dispose();
+            _currentTransaction = null;
         }
     }
     #endregion
diff --git a/src/Conduit/Infrastructure/ICurrentUserAccessor.cs b/src/Conduit/Infrastructure/ICurrentUserAccessor.cs
@@ -2,5 +2,5 @@ namespace Conduit.Infrastructure;
 
 public interface ICurrentUserAccessor
 {
-    string? GetCurrentUsername();
+    public string? GetCurrentUsername();
 }
diff --git a/src/Conduit/Infrastructure/Security/IJwtTokenGenerator.cs b/src/Conduit/Infrastructure/Security/IJwtTokenGenerator.cs
@@ -2,5 +2,5 @@ namespace Conduit.Infrastructure.Security;
 
 public interface IJwtTokenGenerator
 {
-    string CreateToken(string username);
+    public string CreateToken(string username);
 }
diff --git a/src/Conduit/Infrastructure/Security/IPasswordHasher.cs b/src/Conduit/Infrastructure/Security/IPasswordHasher.cs
@@ -5,5 +5,5 @@ namespace Conduit.Infrastructure.Security;
 
 public interface IPasswordHasher : IDisposable
 {
-    Task<byte[]> Hash(string password, byte[] salt);
+    public Task<byte[]> Hash(string password, byte[] salt);
 }
diff --git a/src/Conduit/Infrastructure/ValidationPipelineBehavior.cs b/src/Conduit/Infrastructure/ValidationPipelineBehavior.cs
@@ -12,7 +12,7 @@ IEnumerable<IValidator<TRequest>> validators
 ) : IPipelineBehavior<TRequest, TResponse>
     where TRequest : notnull
 {
-    private readonly List<IValidator<TRequest>> _validators = validators.ToList();
+    private readonly List<IValidator<TRequest>> _validators = [.. validators];
 
     public async Task<TResponse> Handle(
         TRequest request,
diff --git a/src/Conduit/Infrastructure/ValidatorActionFilter.cs b/src/Conduit/Infrastructure/ValidatorActionFilter.cs
@@ -17,10 +17,7 @@ public void OnActionExecuting(ActionExecutingContext filterContext)
 
             foreach (var valuePair in filterContext.ModelState)
             {
-                errors.Add(
-                    valuePair.Key,
-                    valuePair.Value.Errors.Select(x => x.ErrorMessage).ToArray()
-                );
+                errors.Add(valuePair.Key, [.. valuePair.Value.Errors.Select(x => x.ErrorMessage)]);
             }
 
             var content = JsonSerializer.Serialize(new { errors });
diff --git a/src/Conduit/Program.cs b/src/Conduit/Program.cs
@@ -91,7 +91,7 @@
     .Services.AddMvc(opt =>
     {
         opt.Conventions.Add(new GroupByApiRootConvention());
-        opt.Filters.Add(typeof(ValidatorActionFilter));
+        opt.Filters.Add<ValidatorActionFilter>();
         opt.EnableEndpointRouting = false;
     })
     .AddJsonOptions(opt =>
diff --git a/src/Conduit/packages.lock.json b/src/Conduit/packages.lock.json
diff --git a/tests/Conduit.IntegrationTests/packages.lock.json b/tests/Conduit.IntegrationTests/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void RemoveDirectory(string d)`
`43`	`43`	`}`
`44`	`44`	`);`
`45`	`45`
`46`		`-Target(Build, [Format], () => Run("dotnet", "build . -c Release"));`
	`46`	`+Target(Build, [Format], () => Run("dotnet", "build Conduit.sln -c Release"));`
`47`	`47`
`48`	`48`	`Target(`
`49`	`49`	`Test,`
`@@ -67,7 +67,7 @@ void RemoveDirectory(string d)`
`67`	`67`	`{`
`68`	`68`	`Run(`
`69`	`69`	`"dotnet",`
`70`		`- $"publish {project} -c Release -f net8.0 -o ./publish --no-restore --no-build --verbosity=normal"`
	`70`	`+ $"publish {project} -c Release -f net10.0 -o ./publish --no-restore --no-build --verbosity=normal"`
`71`	`71`	`);`
`72`	`72`	`}`
`73`	`73`	`);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"version": 2,`
`3`	`3`	`"dependencies": {`
`4`		`- "net8.0": {`
	`4`	`+ "net10.0": {`
`5`	`5`	`"Bullseye": {`
`6`	`6`	`"type": "Direct",`
`7`	`7`	`"requested": "[6.0.0, )",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.201",`
	`3`	`+ "version": "10.0.100-rc.2.25502.107",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ namespace Conduit.Features.Profiles;`
`5`	`5`
`6`	`6`	`public interface IProfileReader`
`7`	`7`	`{`
`8`		`- Task<ProfileEnvelope> ReadProfile(string username, CancellationToken cancellationToken);`
	`8`	`+ public Task<ProfileEnvelope> ReadProfile(string username, CancellationToken cancellationToken);`
`9`	`9`	`}`