Merge pull request #80 from rbergen/upgrade-net10

rbergen · web-flow · commit b19ae4b8c5ac · 2026-03-22T12:44:00.000+01:00
Upgrade to .NET 10
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -18,10 +18,10 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
 
     - name: Install wasm-tools for AOT compilation
-      run: dotnet workload install wasm-tools-net8
+      run: dotnet workload install wasm-tools
 
     - name: Publish Frontend project
       run: dotnet publish src/Frontend/Frontend.csproj -c Release -o release --nologo
diff --git a/src/Entities/Entities.csproj b/src/Entities/Entities.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PrimeView.Entities</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Frontend/App.razor b/src/Frontend/App.razor
@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>
diff --git a/src/Frontend/Filters/LeaderboardFilterPreset.cs b/src/Frontend/Filters/LeaderboardFilterPreset.cs
@@ -9,9 +9,9 @@ public LeaderboardFilterPreset()
             Name = "Leaderboard";
             ImplementationText = string.Empty;
             ParallelismText = Constants.MultithreadedTag;
-            AlgorithmText = new string[] { Constants.WheelTag, Constants.OtherTag }.JoinFilterValues();
+            AlgorithmText = new[] { Constants.WheelTag, Constants.OtherTag }.JoinFilterValues();
             FaithfulText = Constants.UnfaithfulTag;
-            BitsText = new string[] { Constants.UnknownTag, Constants.OtherTag }.JoinFilterValues();
+            BitsText = new[] { Constants.UnknownTag, Constants.OtherTag }.JoinFilterValues();
         }
 
         public override bool IsFixed => true;
diff --git a/src/Frontend/Filters/MultithreadedLeaderboardFilterPreset.cs b/src/Frontend/Filters/MultithreadedLeaderboardFilterPreset.cs
@@ -9,9 +9,9 @@ public MultithreadedLeaderboardFilterPreset()
             Name = "Multithreaded leaderboard";
             ImplementationText = string.Empty;
             ParallelismText = Constants.SinglethreadedTag;
-            AlgorithmText = new string[] { Constants.WheelTag, Constants.OtherTag }.JoinFilterValues();
+            AlgorithmText = new[] { Constants.WheelTag, Constants.OtherTag }.JoinFilterValues();
             FaithfulText = Constants.UnfaithfulTag;
-            BitsText = new string[] { Constants.UnknownTag, Constants.OtherTag }.JoinFilterValues();
+            BitsText = new[] { Constants.UnknownTag, Constants.OtherTag }.JoinFilterValues();
         }
 
         public override bool IsFixed => true;
diff --git a/src/Frontend/Frontend.csproj b/src/Frontend/Frontend.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
   <PropertyGroup>
     <RootNamespace>PrimeView.Frontend</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RunAOTCompilation>true</RunAOTCompilation>
   </PropertyGroup>
   <ItemGroup>
@@ -11,9 +11,9 @@
     <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
     <PackageReference Include="BlazorTable" Version="1.17.0" />
     <PackageReference Include="CsvHelper" Version="33.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\JsonFileReader\JsonFileReader.csproj" />
diff --git a/src/Frontend/wwwroot/appsettings.json b/src/Frontend/wwwroot/appsettings.json
@@ -9,7 +9,7 @@
 			"IsS3Bucket": "true"
 		},
 		"RestAPIReader": {
-			"APIBaseURI": ""
+			"APIBaseURI": "https://primes.marghidanu.com/v1/"
 		}
 	}
 }
diff --git a/src/JsonFileReader/JsonFileReader.csproj b/src/JsonFileReader/JsonFileReader.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PrimeView.JsonFileReader</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\Entities\Entities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="microsoft.extensions.configuration.binder" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="microsoft.extensions.configuration.binder" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/JsonFileReader/ReportReader.cs b/src/JsonFileReader/ReportReader.cs
@@ -9,24 +9,17 @@
 
 namespace PrimeView.JsonFileReader
 {
-    public class ReportReader : IReportReader
+    public class ReportReader(string baseAddress, IConfiguration configuration) : IReportReader
     {
         private List<ReportSummary>? summaries;
         private Dictionary<string, Report>? reportMap;
-        private readonly HttpClient httpClient;
-        private readonly string? indexFileName;
-        private readonly bool isS3Bucket;
+        private readonly HttpClient httpClient = new() { BaseAddress = new Uri(configuration.GetValue(Constants.BaseURI, baseAddress) ?? baseAddress) };
+        private readonly string? indexFileName = configuration.GetValue<string?>(Constants.Index, null);
+        private readonly bool isS3Bucket = configuration.GetValue(Constants.IsS3Bucket, false);
         private bool haveJsonFilesLoaded = false;
         private bool reachedMaxFileCount = false;
         private int totalReports = 0;
 
-        public ReportReader(string baseAddress, IConfiguration configuration)
-        {
-            this.httpClient = new HttpClient { BaseAddress = new Uri(configuration.GetValue(Constants.BaseURI, baseAddress) ?? baseAddress) };
-            this.indexFileName = configuration.GetValue<string?>(Constants.Index, null);
-            this.isS3Bucket = configuration.GetValue(Constants.IsS3Bucket, false);
-        }
-
         private async Task<Report?> LoadReportJsonFile(string fileName)
         {
             if (string.IsNullOrEmpty(fileName))
diff --git a/src/RestAPIReader/Constants.cs b/src/RestAPIReader/Constants.cs
@@ -3,5 +3,6 @@
     static class Constants
     {
         public const string APIBaseURI = nameof(APIBaseURI);
+        public const string PrimesAPI = nameof(PrimesAPI);
     }
 }
diff --git a/src/RestAPIReader/ExtensionMethods.cs b/src/RestAPIReader/ExtensionMethods.cs
@@ -1,14 +1,18 @@
 ﻿using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using PrimeView.Entities;
+using System;
+using System.Net.Http;
 
 namespace PrimeView.RestAPIReader
 {
     public static class ExtensionMethods
     {
         public static IServiceCollection AddRestAPIReportReader(this IServiceCollection serviceCollection, IConfiguration configuration)
         {
-            return serviceCollection.AddScoped<IReportReader>(sp => new ReportReader(configuration));
+            serviceCollection.AddHttpClient(Constants.PrimesAPI, client => client.BaseAddress = new Uri(configuration.GetValue<string>(Constants.APIBaseURI) ?? string.Empty));
+
+            return serviceCollection.AddScoped<IReportReader, ReportReader>();
         }
 
     }
diff --git a/src/RestAPIReader/PrimesAPIPartial.cs b/src/RestAPIReader/PrimesAPIPartial.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace PrimeView.RestAPIReader.Service
+{
+    public partial class PrimesAPI
+    {
+        partial void UpdateJsonSerializerSettings(JsonSerializerOptions settings)
+        {
+            settings.PropertyNameCaseInsensitive = true;
+            settings.Converters.Add(new CustomDateTimeOffsetConverter());
+        }
+
+        private class CustomDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
+        {
+            private const string DateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+
+            public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                var dateString = reader.GetString();
+                if (string.IsNullOrEmpty(dateString))
+                    return default;
+
+                if (DateTimeOffset.TryParseExact(dateString, DateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out var result))
+                    return result;
+
+                // Fallback to default parsing
+                return DateTimeOffset.Parse(dateString, CultureInfo.InvariantCulture);
+            }
+
+            public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+            {
+                writer.WriteStringValue(value.ToString(DateTimeFormat, CultureInfo.InvariantCulture));
+            }
+        }
+    }
+}
diff --git a/src/RestAPIReader/ReportReader.cs b/src/RestAPIReader/ReportReader.cs
@@ -8,20 +8,13 @@
 
 namespace PrimeView.RestAPIReader
 {
-    public class ReportReader : IReportReader
+    public class ReportReader(IHttpClientFactory httpClientFactory) : IReportReader
     {
         private readonly Dictionary<string, SortedList<int, ReportSummary>> summaryMap = [];
         private readonly Dictionary<string, Report> reportMap = [];
-        private readonly Service.PrimesAPI primesAPI;
+        private readonly Service.PrimesAPI primesAPI = new(httpClientFactory.CreateClient(Constants.PrimesAPI));
         private readonly Dictionary<string, int> totalReportsMap = [];
 
-        public ReportReader(IConfiguration configuration)
-        {
-            this.primesAPI = new(new HttpClient());
-            if (!string.IsNullOrEmpty(configuration[Constants.APIBaseURI]))
-                this.primesAPI.BaseUrl = configuration.GetValue<string>(Constants.APIBaseURI);
-        }
-
         private async Task<(SortedList<int, ReportSummary> summaries, int totalReports)> LoadMissingSummaries(string? runnerId, int skipFirst, int maxSummaryCount)
         {
             runnerId ??= string.Empty;
diff --git a/src/RestAPIReader/RestAPIReader.csproj b/src/RestAPIReader/RestAPIReader.csproj
@@ -1,7 +1,7 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>PrimeView.RestAPIReader</RootNamespace>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -13,17 +13,42 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.0" />
-    <PackageReference Include="microsoft.extensions.configuration.binder" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+    <PackageReference Include="microsoft.extensions.configuration.binder" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Entities\Entities.csproj" />
   </ItemGroup>
   <ItemGroup>
     <OpenApiReference Include="OpenAPIs\v1.json" CodeGenerator="NSwagCSharp" Namespace="PrimeView.RestAPIReader.Service" ClassName="PrimesAPI">
       <SourceUri>https://primes.marghidanu.com/v1</SourceUri>
+      <Options>/JsonLibrary:SystemTextJson </Options>
     </OpenApiReference>
   </ItemGroup>
-</Project>
+
+  <Target Name="FixSystemNamespaceConflict" AfterTargets="GenerateNSwagCSharp">
+    <PropertyGroup>
+      <GeneratedFile>$(MSBuildProjectDirectory)\obj\v1Client.cs</GeneratedFile>
+    </PropertyGroup>
+    <ReplaceTextInFile Condition="Exists('$(GeneratedFile)')" FilePath="$(GeneratedFile)" OldText="public ReportMachineSystem System" NewText="public ReportMachineSystem SystemInfo" />
+  </Target>
+
+  <UsingTask TaskName="ReplaceTextInFile" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <FilePath ParameterType="System.String" Required="true" />
+      <OldText ParameterType="System.String" Required="true" />
+      <NewText ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.IO" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+        var content = File.ReadAllText(FilePath);
+        content = content.Replace(OldText, NewText);
+        File.WriteAllText(FilePath, content);
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">`
	`1`	`+<Router AppAssembly="@typeof(Program).Assembly">`
`2`	`2`	`<Found Context="routeData">`
`3`	`3`	`<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />`
`4`	`4`	`</Found>`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"IsS3Bucket": "true"`
`10`	`10`	`},`
`11`	`11`	`"RestAPIReader": {`
`12`		`- "APIBaseURI": ""`
	`12`	`+ "APIBaseURI": "https://primes.marghidanu.com/v1/"`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`static class Constants`
`4`	`4`	`{`
`5`	`5`	`public const string APIBaseURI = nameof(APIBaseURI);`
	`6`	`+ public const string PrimesAPI = nameof(PrimesAPI);`
`6`	`7`	`}`
`7`	`8`	`}`